You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/06/14 06:55:42 UTC
[42/51] [abbrv] git commit: Merge remote-tracking branch
'origin/master' into ACCUMULO-378
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/master
Commit: 97044d749890e8d08d015ef121c1a4b04f396735
Parents: 949eebb 809b73c
Author: Josh Elser <el...@apache.org>
Authored: Fri Jun 6 11:32:29 2014 -0400
Committer: Josh Elser <el...@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(-)
----------------------------------------------------------------------