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/c7f4398b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c7f4398b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c7f4398b Branch: refs/heads/master Commit: c7f4398bc0baaed6b83c7303b46a4e4333d0f088 Parents: 4ba6587 3199c2a Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Nov 19 12:37:19 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Nov 19 12:37:19 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
