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/f8cdf193 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f8cdf193 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f8cdf193 Branch: refs/heads/master Commit: f8cdf19361dd338a25aa96ec6e5fc6a3a9034d5d Parents: 17bc1ef 0da9a56 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Feb 19 13:29:14 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Feb 19 13:29:14 2014 -0500 ---------------------------------------------------------------------- .../server/master/state/ClosableIterator.java | 23 ++++++++++++++++++++ .../server/master/state/MetaDataStateStore.java | 3 +-- .../master/state/MetaDataTableScanner.java | 2 +- .../master/state/RootTabletStateStore.java | 4 +--- .../server/master/state/TabletStateStore.java | 3 +-- .../master/state/ZooTabletStateStore.java | 8 +++++-- .../accumulo/master/TabletGroupWatcher.java | 15 ++++++++++++- 7 files changed, 47 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
