This is an automated email from the git hooks/post-receive script. New change to branch master in repository wao. See http://git.codelutin.com/wao.git from 536f15a Merge branch 'release/4.2' adds 71376da [jgitflow-maven-plugin]updating poms for 4.3-SNAPSHOT development adds fd49f8a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds fa65e2e Merge branch 'master' into develop adds 76db63d [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 88bb66c Suite au remaniement de l'énumération ContactState, il y a eu une inversion entre deux champs (fixes #6039) adds ae3aed6 Quand on alimente les valeurs des filtres au calcul du plan d'échantillonnage ObsVente, on gère le cas des lignes qui n'ont pas de lieu terrestre associés (elle ne devraient pas au niveau métier ?) (fixes #6038) adds cf2f84b POM en version 4.2.1 conformément à la feuille de route adds 1d7abc6 [jgitflow-maven-plugin]updating poms for branch'release/4.2.1' with non-snapshot versions adds d2cb61f Merge branch 'release/4.2.1' No new revisions were added by this update. Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../main/java/fr/ifremer/wao/entity/ContactState.java | 4 ++-- wao-services/pom.xml | 2 +- .../wao/services/service/SampleRowsFilterValues.java | 18 ++++++++++-------- wao-web/pom.xml | 2 +- 6 files changed, 16 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.