Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c82498e Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c82498e Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9c82498e Branch: refs/heads/master Commit: 9c82498e4a6b38460f064eaf480cb6337b2f4549 Parents: 4ec7898 1392e07 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Mar 5 16:12:42 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Mar 5 16:12:42 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/master/Master.java | 4 ---- .../java/org/apache/accumulo/master/TabletGroupWatcher.java | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9c82498e/server/master/src/main/java/org/apache/accumulo/master/Master.java ----------------------------------------------------------------------
