This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 7254b37 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 5549f18 Utilisation d'application config pour parser le fichier de log construit au chargement de l'application (refs #7456) new 33e83f1 Correction du chemin de fichier de log (termine #7456) Merge branch 'feature/7456' into 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 33e83f1f7f095f236dc217067cc611be3efde6c7 Merge: 7254b37 5549f18 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 11:58:35 2015 +0200 Correction du chemin de fichier de log (termine #7456) Merge branch 'feature/7456' into develop commit 5549f18ed86e09f97c17565822fa7c8343e7d904 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 14 11:58:31 2015 +0200 Utilisation d'application config pour parser le fichier de log construit au chargement de l'application (refs #7456) Summary of changes: .../src/main/java/fr/ird/observe/ObserveConfig.java | 5 +++++ .../src/main/java/fr/ird/observe/ObserveRunner.java | 15 ++++++++++++--- .../src/main/{filters => resources}/log4j.properties | 2 +- .../main/{filters => resources}/observe-log4j.properties | 2 +- 4 files changed, 19 insertions(+), 5 deletions(-) rename observe-swing/src/main/{filters => resources}/log4j.properties (98%) rename observe-swing/src/main/{filters => resources}/observe-log4j.properties (95%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.