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/96471f44 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/96471f44 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/96471f44 Branch: refs/heads/master Commit: 96471f444cfc23bf806f7efc4ecc18bf6affaaa1 Parents: 0d80276 435b5c7 Author: Eric Newton <eric.new...@gmail.com> Authored: Fri Nov 22 15:59:26 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Fri Nov 22 15:59:26 2013 -0500 ---------------------------------------------------------------------- .../accumulo/fate/zookeeper/ZooSession.java | 14 ----- .../apache/accumulo/proxy/SimpleProxyIT.java | 54 ++++++-------------- .../org/apache/accumulo/monitor/Monitor.java | 24 ++++----- .../apache/accumulo/test/randomwalk/State.java | 2 +- 4 files changed, 28 insertions(+), 66 deletions(-) ----------------------------------------------------------------------
