Merge branch 'fluo-723'
Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo/commit/b30c9d76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo/tree/b30c9d76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo/diff/b30c9d76 Branch: refs/heads/master Commit: b30c9d76f917275cf552a75b49d57c89efb80c79 Parents: aa5c766 0e1a601 Author: Keith Turner <ktur...@apache.org> Authored: Mon Jul 25 14:55:22 2016 -0400 Committer: Keith Turner <ktur...@apache.org> Committed: Mon Jul 25 14:55:22 2016 -0400 ---------------------------------------------------------------------- .../org/apache/fluo/api/client/FluoAdmin.java | 31 ++++++++++++-------- .../fluo/cluster/runner/ClusterAppRunner.java | 2 +- .../apache/fluo/core/client/FluoAdminImpl.java | 3 +- .../org/apache/fluo/integration/ITBaseImpl.java | 5 ++-- .../org/apache/fluo/integration/ITBaseMini.java | 5 ++-- .../integration/client/FluoAdminImplIT.java | 10 ++++--- .../java/org/apache/fluo/mini/MiniFluoImpl.java | 4 +-- 7 files changed, 35 insertions(+), 25 deletions(-) ----------------------------------------------------------------------
