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/3199c2a1 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3199c2a1 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3199c2a1 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 3199c2a11fa07879cbec1fc853f1fd8c81e55702 Parents: 3875de3 487eec3 Author: Eric Newton <eric.new...@gmail.com> Authored: Tue Nov 19 12:35:04 2013 -0500 Committer: Eric Newton <eric.new...@gmail.com> Committed: Tue Nov 19 12:35:04 2013 -0500 ---------------------------------------------------------------------- .../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/3199c2a1/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java ----------------------------------------------------------------------
