Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6965c41c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6965c41c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6965c41c Branch: refs/heads/master Commit: 6965c41c12b9a51e4d5d08ee022975dc8cf28958 Parents: e6e85cf c5aa060 Author: Josh Elser <els...@apache.org> Authored: Wed Jun 3 21:00:12 2015 -0400 Committer: Josh Elser <els...@apache.org> Committed: Wed Jun 3 21:00:12 2015 -0400 ---------------------------------------------------------------------- .../apache/accumulo/core/conf/PropertyType.java | 2 +- .../accumulo/core/conf/PropertyTypeTest.java | 15 ++++ .../accumulo/server/master/LiveTServerSet.java | 27 +++++- .../org/apache/accumulo/server/util/Admin.java | 45 +++++++++- .../server/master/LiveTServerSetTest.java | 52 +++++++++++ .../apache/accumulo/server/util/AdminTest.java | 94 ++++++++++++++++++++ .../master/MasterClientServiceHandler.java | 5 ++ .../master/tserverOps/ShutdownTServer.java | 2 +- 8 files changed, 235 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/6965c41c/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java ----------------------------------------------------------------------