Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/oodt


Project: http://git-wip-us.apache.org/repos/asf/oodt/repo
Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/5f1a8e8e
Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/5f1a8e8e
Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/5f1a8e8e

Branch: refs/heads/feature/zookeeper-config
Commit: 5f1a8e8e3f3045c1a30b52e3d18305e0f7fb9bc2
Parents: e3d5d03 f415976
Author: Tom Barber <t...@analytical-labs.com>
Authored: Sat Jul 29 19:24:39 2017 +0100
Committer: Tom Barber <t...@analytical-labs.com>
Committed: Sat Jul 29 19:24:39 2017 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 agility/setup.py                                |  2 +-
 core/pom.xml                                    |  2 +-
 .../oodt/cas/filemgr/structs/Element.java       | 10 ++
 .../oodt/cas/filemgr/structs/ProductType.java   | 14 +++
 .../apache/oodt/pcs/util/FileManagerUtils.java  | 98 ++++++++++++++------
 .../webcomponents/filemgr/FileManagerConn.java  | 42 +++++++--
 7 files changed, 130 insertions(+), 40 deletions(-)
----------------------------------------------------------------------


Reply via email to