OODT-755 fix merge
Project: http://git-wip-us.apache.org/repos/asf/oodt/repo Commit: http://git-wip-us.apache.org/repos/asf/oodt/commit/6567c85f Tree: http://git-wip-us.apache.org/repos/asf/oodt/tree/6567c85f Diff: http://git-wip-us.apache.org/repos/asf/oodt/diff/6567c85f Branch: refs/heads/master Commit: 6567c85fb74254d474b71723d5541b438a2cd399 Parents: 0ea1241 dbe3e02 Author: Tom Barber <[email protected]> Authored: Thu Oct 15 23:49:23 2015 +0100 Committer: Tom Barber <[email protected]> Committed: Thu Oct 15 23:49:23 2015 +0100 ---------------------------------------------------------------------- .../cas/filemgr/system/XmlRpcFileManager.java | 43 ++++++++--- .../filemgr/system/XmlRpcFileManagerClient.java | 78 +++++++++++--------- 2 files changed, 79 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oodt/blob/6567c85f/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java ---------------------------------------------------------------------- diff --cc filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java index 9cdd3f9,b7370c1..0af87b0 --- a/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java +++ b/filemgr/src/main/java/org/apache/oodt/cas/filemgr/system/XmlRpcFileManager.java @@@ -17,7 -17,6 +17,7 @@@ package org.apache.oodt.cas.filemgr.system; - //APACHE imports ++ import com.google.common.collect.Lists; import org.apache.oodt.cas.filemgr.catalog.Catalog;
