Merge branch 'master' into CURATOR-3.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/20c6955b Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/20c6955b Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/20c6955b Branch: refs/heads/CURATOR-3.0 Commit: 20c6955b1e3fb9af2cac6fd6a7056b7f8ff14904 Parents: 6a245fb 6ae3f85 Author: Cam McKenzie <[email protected]> Authored: Wed May 25 08:36:29 2016 +1000 Committer: Cam McKenzie <[email protected]> Committed: Wed May 25 08:36:29 2016 +1000 ---------------------------------------------------------------------- .../org/apache/curator/retry/BoundedExponentialBackoffRetry.java | 2 +- .../java/org/apache/curator/retry/ExponentialBackoffRetry.java | 4 ++-- .../src/main/java/org/apache/curator/retry/RetryNTimes.java | 2 +- .../main/java/org/apache/curator/retry/RetryUntilElapsed.java | 2 +- .../src/main/java/org/apache/curator/retry/SleepingRetry.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
