This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 3ac965dedf75a2fab6d2962d56f327a9c44d3036 Merge: a44c7eb 4d9cc98 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Apr 6 14:41:36 2016 +0200 Livrable #8157 Merge branch 'feature/8157-2' into develop .../service/export/cps/SamplingNumberRowModel.java | 1 + .../tutti/service/sampling/CacheExtractedKey.java | 10 ++++++ .../service/sampling/CruiseSamplingCache.java | 2 +- .../sampling/CruiseSamplingInternalCache.java | 42 ++++++++++++---------- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + 6 files changed, 38 insertions(+), 19 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.