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 06aefae6b9904ebb306be25083a360c27d15de1b Merge: 1f4faad 30b65be Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 25 10:17:59 2016 +0200 Livrable #8270 Merge branch 'feature/8270' into develop .../tutti/persistence/TuttiPersistenceImpl.java | 4 +- .../persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../persistence/dao/referential/pmfm/PmfmId2.java | 168 +++++++++++++++++++++ .../CaracteristicPersistenceService.java | 10 +- .../CaracteristicPersistenceServiceImpl.java | 15 +- .../i18n/tutti-persistence_en_GB.properties | 3 + .../i18n/tutti-persistence_fr_FR.properties | 3 + .../ifremer/tutti/service/PersistenceService.java | 4 +- .../fr/ifremer/tutti/service/TuttiDataContext.java | 2 +- 9 files changed, 190 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.