This is an automated email from the git hooks/post-receive script. New commit to branch feature/importBigfin in repository tutti. See http://git.codelutin.com/tutti.git commit b22829bb036c78fd6f92a597ca82a3ff9dd13d2e Merge: fabfbef d7c0335 Author: Kevin Morin <morin@codelutin.com> Date: Mon Sep 22 17:25:52 2014 +0200 Merge remote-tracking branch 'origin/develop' into feature/importBigfin .../tutti/persistence/test/DatabaseResource.java | 31 +++++++- .../config/TuttiPersistenceConfigTest.java | 2 +- .../resources/tutti-test-read-dbEmpty.properties | 27 ------- .../src/test/resources/tutti-test-read.properties | 27 ------- .../service/export/generic/CatchExportModel.java | 2 +- .../ifremer/tutti/service/ServiceDbResource.java | 27 ++++++- .../generic/TuttiExportServiceAno5804Test.java | 82 ++++++++++++++++++++++ .../export/generic/TuttiExportServiceTest.java | 10 +-- .../resources/tutti-test-read-dbCGFS.properties | 26 ------- .../resources/tutti-test-read-dbExport.properties | 26 ------- .../resources/tutti-test-read-dbMedits.properties | 25 ------- .../action/SelectSpeciesForBenthosBatchAction.java | 2 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 15 files changed, 149 insertions(+), 144 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.