This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit ea7f9514de5a84d6f547489ea0550dba74f5abd5 Merge: f0322d4 e625afa Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 13 20:22:05 2015 +0200 Permettre de configurer les logs chez le client (termine #7455) Merge branch 'feature/7455' into develop .../main/java/fr/ird/observe/IObserveConfig.java | 2 + observe-swing/pom.xml | 1 - .../main/{resources => filters}/log4j.properties | 5 +- .../observe-log4j.properties} | 4 +- .../src/main/filters/observe-ui.properties | 1 - .../main/java/fr/ird/observe/ObserveCLAction.java | 43 ++++------- .../main/java/fr/ird/observe/ObserveConfig.java | 83 ++++++++++++++++------ .../java/fr/ird/observe/ObserveConfigOption.java | 33 +++++---- .../fr/ird/observe/ObserveResourceManager.java | 18 ++--- .../main/java/fr/ird/observe/ObserveRunner.java | 82 ++++++++++++++------- .../resources/i18n/observe-swing_en_GB.properties | 2 + .../resources/i18n/observe-swing_es_ES.properties | 2 + .../resources/i18n/observe-swing_fr_FR.properties | 4 +- 13 files changed, 176 insertions(+), 104 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.