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/0b010256 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0b010256 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0b010256 Branch: refs/heads/master Commit: 0b010256d299da2020146cec498739079d03223a Parents: 7d9373b 758a364 Author: Josh Elser <els...@apache.org> Authored: Tue Oct 21 12:38:44 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Oct 21 12:38:44 2014 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b010256/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java ----------------------------------------------------------------------
