Merge branch 'feature/zookeeper-config' of https://github.com/IMS94/oodt into feature/zookeeper-config
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/59d7f3c0 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/59d7f3c0 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/59d7f3c0 Branch: refs/heads/master Commit: 59d7f3c012dc1ff9ba9d3caf2ba04791e461a38e Parents: 811b98d 2fbd08f Author: Chris Mattmann <[email protected]> Authored: Fri Jul 14 09:23:13 2017 -0700 Committer: Chris Mattmann <[email protected]> Committed: Fri Jul 14 09:23:13 2017 -0700 ---------------------------------------------------------------------- .../DistributedConfigurationManager.java | 15 ++---- .../config/distributed/utils/FilePathUtils.java | 53 ++++++++++++++++++++ config/src/main/resources/etc/log4j.xml | 2 +- .../DistributedConfigurationManagerTest.java | 18 +++++-- 4 files changed, 71 insertions(+), 17 deletions(-) ----------------------------------------------------------------------
