This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.0.x in repository coselmar. See http://git.codelutin.com/coselmar.git commit e6926a745cc5a86dbe3d468efc0c938ac41c7746 Merge: 2a426c4 33a37c3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:41:55 2015 +0100 [jgitflow-maven-plugin]merging 'release/1.0.2' into 'master-1.0.x' coselmar-bundle/pom.xml | 4 +- coselmar-persistence/pom.xml | 2 +- .../coselmar/config/CoselmarServicesConfig.java | 4 ++ .../config/CoselmarServicesConfigOption.java | 5 ++ coselmar-rest/pom.xml | 2 +- .../java/fr/ifremer/coselmar/beans/HealthBean.java | 73 ++++++++++++++++++++ .../coselmar/services/v1/HealthService.java | 78 ++++++++++++++++++++++ .../i18n/coselmar-services_en_GB.properties | 2 +- .../i18n/coselmar-services_fr_FR.properties | 2 +- coselmar-rest/src/main/resources/mapping | 5 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/health.html | 53 +++++++++++++++ coselmar-ui/src/main/webapp/js/coselmar-health.js | 37 ++++++++++ pom.xml | 10 ++- 14 files changed, 270 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.