Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 69B4D10176 for ; Wed, 4 Jun 2014 18:45:48 +0000 (UTC) Received: (qmail 59099 invoked by uid 500); 4 Jun 2014 18:45:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 59023 invoked by uid 500); 4 Jun 2014 18:45:47 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 58936 invoked by uid 99); 4 Jun 2014 18:45:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jun 2014 18:45:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 58A7393F395; Wed, 4 Jun 2014 18:45:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Wed, 04 Jun 2014 18:45:52 -0000 Message-Id: <5dc54704ec4142b282d9a2fe9c966940@git.apache.org> In-Reply-To: <2d0f672c2dc34c56b418963b5fc193a9@git.apache.org> References: <2d0f672c2dc34c56b418963b5fc193a9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [6/6] git commit: Merge branch 'cassandra-2.1' into trunk Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/087394c8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/087394c8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/087394c8 Branch: refs/heads/trunk Commit: 087394c8a21742623a647a6c5b5a7f18ae26ed3a Parents: f81d5dd 8e85f0c Author: Jonathan Ellis Authored: Wed Jun 4 13:45:42 2014 -0500 Committer: Jonathan Ellis Committed: Wed Jun 4 13:45:42 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/gms/FailureDetector.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/087394c8/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------