Merge remote-tracking branch 'origin/master' into ACCUMULO-378
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97044d74 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97044d74 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97044d74 Branch: refs/heads/ACCUMULO-378 Commit: 97044d749890e8d08d015ef121c1a4b04f396735 Parents: 949eebb 809b73c Author: Josh Elser <els...@apache.org> Authored: Fri Jun 6 11:32:29 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Jun 6 11:32:29 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++ pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
