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/a2652c3c Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a2652c3c Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a2652c3c Branch: refs/heads/master Commit: a2652c3c41fd2c4b50c5b4d98d8edf07dcbc99f3 Parents: ac28b22 98211f5 Author: Christopher Tubbs <ctubb...@apache.org> Authored: Mon Jan 6 21:50:12 2014 -0500 Committer: Christopher Tubbs <ctubb...@apache.org> Committed: Mon Jan 6 21:50:12 2014 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 1 - 1 file changed, 1 deletion(-) ----------------------------------------------------------------------