Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/33f73016 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33f73016 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33f73016 Branch: refs/heads/1.8 Commit: 33f730160e4b3624548c110f5eb9e9f45eb0d2dd Parents: 6a677ad d23676d Author: Josh Elser <els...@apache.org> Authored: Fri Sep 23 10:24:54 2016 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Sep 23 10:24:54 2016 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/cli/ClientOpts.java | 37 ++++++++++++++++---- .../accumulo/core/cli/TestClientOpts.java | 12 ++++--- .../org/apache/accumulo/server/util/Admin.java | 14 +------- 3 files changed, 39 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/33f73016/core/src/main/java/org/apache/accumulo/core/cli/ClientOpts.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/33f73016/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java ----------------------------------------------------------------------
