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 70764d1 Utilisation de pom 1.5 new b8a646a [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8d3a6ea Création d'une branche 4.1.x adds 927f079 Mise à jour du pom pour la branche 4.1.x adds 6509eef Fusion dans la branche 4.1.x des corrections effectuées en 4.0.x adds ce08564 [maven-release-plugin] prepare release wao-4.1 adds c8785db [maven-release-plugin] copy for tag wao-4.1 adds 5196c1d [jgitflow-maven-plugin]updating poms for branch '4.2-RC1' with snapshot versions new dca9291 Ajout des entêtes de licences manquants new a771eb5 [jgitflow-maven-plugin]updating poms for branch'release/4.2-RC1' with non-snapshot versions new a403303 Fusion de la branche de release dans master new 285b92f Merge branch 'master' into develop new ddd83d0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 ddd83d014a593be93d202686865dbe1576515117 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:59 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 285b92f4b87ffc4df318b8c57b93715b73e3eb81 Merge: b8a646a a403303 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:59 2014 +0200 Merge branch 'master' into develop commit b8a646aa69e30d32fe3b38207076bf2307ed6a51 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:03:58 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a40330314142fa9b0fa6b23b01e75cbcd6965b89 Merge: c8785db a771eb5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 11:02:34 2014 +0200 Fusion de la branche de release dans master commit a771eb59764fe300bae1f41a11fdded7f34c4e22 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 10:50:42 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.2-RC1' with non-snapshot versions commit dca92911e1349bbda1882f83c9ba1eab33770ea1 Author: Maven Release <maven-release@codelutin.com> Date: Fri Oct 24 10:48:41 2014 +0200 Ajout des entêtes de licences manquants Summary of changes: pom.xml | 2 +- .../fr/ifremer/wao/WaoTopiaPersistenceContext.java | 21 +++++++++++++++++++++ .../java/fr/ifremer/wao/entity/ContactStates.java | 21 +++++++++++++++++++++ .../service/administration/ReferentialService.java | 1 + .../csv/operations/ContactStateParserFormatter.java | 21 +++++++++++++++++++++ .../wao/web/RedirectToContextPathRootFilter.java | 21 +++++++++++++++++++++ .../ifremer/wao/web/action/EditContactAction.java | 2 +- .../administration/InvalidateAllCachesAction.java | 21 +++++++++++++++++++++ .../administration/invalidate-all-caches-input.jsp | 20 ++++++++++++++++++++ .../WEB-INF/content/templates/td-effort-obsmer.jsp | 20 ++++++++++++++++++++ .../webapp/WEB-INF/content/templates/td-effort.jsp | 20 ++++++++++++++++++++ 11 files changed, 168 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.