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/3d12c328 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3d12c328 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3d12c328 Branch: refs/heads/master Commit: 3d12c32856c65ced31a10a58fe0bd3563cbb1bd9 Parents: c662e0a 443ae2d Author: Josh Elser <els...@apache.org> Authored: Thu Oct 30 11:18:56 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Oct 30 11:18:56 2014 -0400 ---------------------------------------------------------------------- .../apache/accumulo/fate/zookeeper/Retry.java | 20 ++++++++++ .../accumulo/fate/zookeeper/RetryFactory.java | 2 +- .../fate/zookeeper/RetryFactoryTest.java | 39 ++++++++++++++++++++ 3 files changed, 60 insertions(+), 1 deletion(-) ----------------------------------------------------------------------
