Merge https://github.com/apache/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/e59e77c1 Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/e59e77c1 Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/e59e77c1 Branch: refs/heads/development Commit: e59e77c1ae3e7fe27cf5d5ec232da219807f2f21 Parents: 8315382 7616e00 Author: Chris Mattmann <[email protected]> Authored: Wed Jul 19 21:49:29 2017 -0700 Committer: Chris Mattmann <[email protected]> Committed: Wed Jul 19 21:49:29 2017 -0700 ---------------------------------------------------------------------- CHANGES.txt | 16 +++++++- agility/setup.py | 2 +- cli/pom.xml | 2 +- commons/pom.xml | 2 +- core/pom.xml | 2 +- crawler/pom.xml | 2 +- curator/services/pom.xml | 2 +- curator/sso/pom.xml | 2 +- curator/webapp/pom.xml | 2 +- filemgr/pom.xml | 2 +- metadata/pom.xml | 2 +- mvn/archetypes/opsui/pom.xml | 2 +- mvn/archetypes/pom.xml | 2 +- mvn/archetypes/radix/pom.xml | 2 +- .../radix/src/main/resources/bin/radix | 2 +- mvn/plugins/cas-install/pom.xml | 2 +- pcs/core/pom.xml | 2 +- pcs/input/pom.xml | 2 +- pcs/opsui/pom.xml | 2 +- pcs/services/pom.xml | 2 +- pge/pom.xml | 2 +- .../cas/pge/staging/FileManagerFileStager.java | 1 + .../pge/staging/TestFileManagerFileStager.java | 41 ++++++++++++++++++++ pom.xml | 2 +- resource/pom.xml | 2 +- webapp/components/pom.xml | 2 +- webapp/fmbrowser/pom.xml | 4 +- webapp/fmprod/pom.xml | 2 +- webapp/wmonitor/pom.xml | 4 +- webapp/wmservices/pom.xml | 6 +-- workflow/pom.xml | 2 +- 31 files changed, 88 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/e59e77c1/core/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/e59e77c1/filemgr/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/e59e77c1/pom.xml ----------------------------------------------------------------------
