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/e7534e6d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7534e6d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7534e6d Branch: refs/heads/master Commit: e7534e6dd8aa973f2801154e6312c187fc20b8de Parents: 70142da 9ebb496 Author: Bill Havanki <bhava...@cloudera.com> Authored: Fri Apr 11 13:17:38 2014 -0400 Committer: Bill Havanki <bhava...@cloudera.com> Committed: Fri Apr 11 13:17:38 2014 -0400 ---------------------------------------------------------------------- .../java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
