Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 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/cfced4cf Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cfced4cf Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cfced4cf Branch: refs/heads/master Commit: cfced4cf6e48a4f36a4e38404c1ceeef3547baa3 Parents: 0b0ef70 494d694 Author: Eric Newton <eric.new...@gmail.com> Authored: Wed Feb 19 17:25:03 2014 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Wed Feb 19 17:25:03 2014 -0500 ---------------------------------------------------------------------- .../apache/accumulo/core/client/Instance.java | 10 ++++----- .../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 +++++-- .../server/watcher/MonitorLog4jWatcher.java | 10 ++------- .../server/zookeeper/DistributedWorkQueue.java | 2 +- .../accumulo/master/TabletGroupWatcher.java | 15 ++++++++++++- 10 files changed, 54 insertions(+), 26 deletions(-) ----------------------------------------------------------------------
