You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/12/20 17:10:38 UTC

[04/12] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Merge branch '1.5.1-SNAPSHOT' into 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/ed730399
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed730399
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed730399

Branch: refs/heads/master
Commit: ed7303998a39e335f1876a849612250bd29ce69e
Parents: 0893667 6c96687
Author: Josh Elser <el...@apache.org>
Authored: Thu Dec 19 23:06:44 2013 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Thu Dec 19 23:06:44 2013 -0500

----------------------------------------------------------------------
 .../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed730399/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
----------------------------------------------------------------------