This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit bab86b3b84b189e33dab0f5a54d42a8681d1c579 Merge: ee1ac27 26102ed Author: Brendan Le Ny <bleny@codelutin.com> Date: Mon Mar 2 18:22:08 2015 +0100 Fusion de la branche 'feature/6733' dans develop (testable-cl #6733) .../service/ContactsFilterValuesCacheKey.java | 3 +- .../services/service/SampleRowsFilterValues.java | 9 +- .../fr/ifremer/wao/services/service/Synthesis.java | 22 +++++ .../wao/services/service/SynthesisCacheKey.java | 49 +++++++++- .../wao/services/service/SynthesisService.java | 103 +++++++++++++++------ .../fr/ifremer/wao/web/action/SynthesisAction.java | 2 +- ...n.java => SynthesisFilterValuesJsonAction.java} | 65 ++++++------- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 4 +- .../src/main/webapp/WEB-INF/decorators/layout.jsp | 2 + 9 files changed, 182 insertions(+), 77 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.