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 238d604 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 2f6ddd2 Export du réalisé depuis le plan scléro (fixes #6543) new 0be4426 Fusion des modifications faites pour la release dans develop The 2 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 0be44262ff5b8b76ccdbf996573c833aee3d94dc Merge: 2f6ddd2 238d604 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:01:56 2015 +0100 Fusion des modifications faites pour la release dans develop commit 2f6ddd2bf51920abe7a5242ecdf582b45d2f75bd Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 15:58:05 2015 +0100 Export du réalisé depuis le plan scléro (fixes #6543) Summary of changes: .../wao/services/service/SamplingPlanService.java | 16 +++ .../SclerochronologySamplingPlanService.java | 44 ++++++++ .../SclerochronologySamplingPlanExportModel.java | 116 +++++++++++++++++++++ .../ExportSamplingPlanWithStatisticsAction.java | 9 +- .../WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 6 ++ 6 files changed, 187 insertions(+), 6 deletions(-) create mode 100644 wao-services/src/main/java/fr/ifremer/wao/services/service/csv/SclerochronologySamplingPlanExportModel.java rename wao-web/src/main/java/fr/ifremer/wao/web/action/{obsmer => }/ExportSamplingPlanWithStatisticsAction.java (85%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.