Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/569c6bcd Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/569c6bcd Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/569c6bcd Branch: refs/heads/master Commit: 569c6bcd250cc58dba8d23acba3e04b2c2ca8306 Parents: 56e4483 2805630 Author: Josh Elser <els...@apache.org> Authored: Tue Nov 4 15:03:33 2014 -0500 Committer: Josh Elser <els...@apache.org> Committed: Tue Nov 4 15:03:33 2014 -0500 ---------------------------------------------------------------------- .../src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java | 3 +++ 1 file changed, 3 insertions(+) ----------------------------------------------------------------------
