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/4fbba38a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4fbba38a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4fbba38a Branch: refs/heads/master Commit: 4fbba38aea78467b6299d2ecb2339d058f8f3ebf Parents: b8bd259 9c092ca Author: Keith Turner <ktur...@apache.org> Authored: Mon Jan 6 21:12:57 2014 -0500 Committer: Keith Turner <ktur...@apache.org> Committed: Mon Jan 6 21:12:57 2014 -0500 ---------------------------------------------------------------------- .../core/client/impl/ThriftTransportPool.java | 100 +++++++++++--- .../org/apache/accumulo/core/util/CleanUp.java | 63 +++++++++ .../accumulo/fate/zookeeper/ZooSession.java | 23 +++- .../accumulo/test/functional/CleanUpIT.java | 137 +++++++++++++++++++ 4 files changed, 304 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
