Merge branch '1.5.2-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/9ebb4967 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9ebb4967 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9ebb4967 Branch: refs/heads/master Commit: 9ebb4967eaa1d97bdea62edf611cee7e860f4669 Parents: 81f4805 7a14fcc Author: Bill Havanki <bhava...@cloudera.com> Authored: Fri Apr 11 13:17:15 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Fri Apr 11 13:17:15 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9ebb4967/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java ----------------------------------------------------------------------
