Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d1b3403d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d1b3403d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d1b3403d Branch: refs/heads/master Commit: d1b3403db8a41ef4059c3d17bd759527984543ce Parents: 7c4d620 41b72b5 Author: Sean Busbey <bus...@cloudera.com> Authored: Tue Jul 1 12:48:38 2014 -0500 Committer: Sean Busbey <bus...@cloudera.com> Committed: Tue Jul 1 12:48:38 2014 -0500 ---------------------------------------------------------------------- .../accumulo/fate/zookeeper/ZooSession.java | 14 +++++++-- .../accumulo/fate/zookeeper/ZooSessionTest.java | 32 ++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
