Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 1A042200B32 for ; Wed, 25 May 2016 00:32:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 188D1160A37; Tue, 24 May 2016 22:32:55 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 86A22160A35 for ; Wed, 25 May 2016 00:32:54 +0200 (CEST) Received: (qmail 43056 invoked by uid 500); 24 May 2016 22:32:53 -0000 Mailing-List: contact commits-help@curator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@curator.apache.org Delivered-To: mailing list commits@curator.apache.org Received: (qmail 43040 invoked by uid 99); 24 May 2016 22:32:53 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 May 2016 22:32:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9604BE02A1; Tue, 24 May 2016 22:32:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: cammckenzie@apache.org To: commits@curator.apache.org Date: Tue, 24 May 2016 22:32:54 -0000 Message-Id: <5181f02c153548efa070fa0096182ba3@git.apache.org> In-Reply-To: <8bcb0e45dc274ac58efd9e0fea8ac8a3@git.apache.org> References: <8bcb0e45dc274ac58efd9e0fea8ac8a3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] curator git commit: Merge branch 'CURATOR-262' of https://github.com/ddyankov/curator into CURATOR-262 archived-at: Tue, 24 May 2016 22:32:55 -0000 Merge branch 'CURATOR-262' of https://github.com/ddyankov/curator into CURATOR-262 Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/6ae3f859 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/6ae3f859 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/6ae3f859 Branch: refs/heads/master Commit: 6ae3f8591f5e2b31d4b53ac734df231b20408a5b Parents: d63e06e 630c009 Author: Cam McKenzie Authored: Wed May 25 08:15:16 2016 +1000 Committer: Cam McKenzie Committed: Wed May 25 08:15:16 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(-) ----------------------------------------------------------------------