tree 373ec221d208072c6471730a101ba99b877fe9d6
parent eded6451be8dc10945c110955d2bfcfe629eac32
parent ae055c09e13b95278a795b4f5eb45dbe8b99a140
author Hugo Arès <hugo.ares@ericsson.com> 1426857269 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1426857354 -0400

Merge branch 'stable-2.10' into stable-2.11

* stable-2.10:
  Fix replication_log with external log4j.configuration

Change-Id: I894ad73610106fe6e2b4d56d6b1749546e14c3b8