This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 6e20d44 On permet de modifier les membres d'un labo directement depuis le formulaire de modification du labo (fixes #6489) new 9f8ac82 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 696e106 [jgitflow-maven-plugin]updating poms for branch '5.0-RC1' with snapshot versions new 8e70298 Utilisation de la dernière version de pom new ce0ced0 Ajout des entêtes manquants new d8bdca7 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions new 8c8e421 Merge branch 'release/5.0-RC1' new 72836a5 Merge branch 'master' into develop new 238d604 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 238d604a61d25d1cc246e9580dc03b86261f7df3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:56 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 72836a566ba576b1332488e6889f38a97682f1a8 Merge: 9f8ac82 8c8e421 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:56 2015 +0000 Merge branch 'master' into develop commit 9f8ac825bdc505411111fcd31ed3cd60295a971b Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:55 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8c8e421c42e2bd3cd8453f57adcf8a1377b41aa8 Merge: 3376104 d8bdca7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:08:54 2015 +0000 Merge branch 'release/5.0-RC1' commit d8bdca7f2122b97125c61927896fe168726b693f Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:05:50 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC1' with non-snapshot versions commit ce0ced08822bf954495e7bfe9ce81d867215a991 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 10:05:29 2015 +0000 Ajout des entêtes manquants commit 8e702988cfff694fc26aab2b0c9e642a8bbcbf01 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:58:02 2015 +0000 Utilisation de la dernière version de pom Summary of changes: pom.xml | 2 +- .../java/fr/ifremer/wao/AbstractWaoTopiaDao.java | 21 +++++++++++++++++++++ .../wao/entity/IndividualMeasurementStrategy.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/LaboratoryImpl.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/Organisations.java | 21 +++++++++++++++++++++ .../wao/entity/SclerochronologySamplingContext.java | 21 +++++++++++++++++++++ .../main/java/fr/ifremer/wao/entity/Specieses.java | 21 +++++++++++++++++++++ .../service/IllegalSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSizeException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleSubmissionException.java | 21 +++++++++++++++++++++ .../service/IllegalSampleTreatmentException.java | 21 +++++++++++++++++++++ ...ssingIndividualMeasurementStrategyException.java | 21 +++++++++++++++++++++ .../service/MissingSampleReceptionException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSizeException.java | 21 +++++++++++++++++++++ .../service/MissingSampleSubmissionException.java | 21 +++++++++++++++++++++ ...ingSclerochronologySamplingContextException.java | 21 +++++++++++++++++++++ .../services/service/MissingSpeciesException.java | 21 +++++++++++++++++++++ .../service/administration/LaboratoriesService.java | 21 +++++++++++++++++++++ .../administration/OrganisationsService.java | 21 +++++++++++++++++++++ .../service/administration/WaoUsersList.java | 21 +++++++++++++++++++++ .../services/service/csv/SpeciesImportModel.java | 21 +++++++++++++++++++++ .../csv/operations/SpeciesParserFormatter.java | 21 +++++++++++++++++++++ .../services/service/SclerochronologyFixtures.java | 21 +++++++++++++++++++++ .../SclerochronologySamplingPlanServiceTest.java | 21 +++++++++++++++++++++ .../ifremer/wao/services/service/WaoFixtures.java | 21 +++++++++++++++++++++ .../action/administration/ImportSpeciesAction.java | 21 +++++++++++++++++++++ .../SamplingPlanAction-conversion.properties | 20 ++++++++++++++++++++ 27 files changed, 546 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.