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 0CAFF11730 for ; Thu, 12 Jun 2014 19:54:29 +0000 (UTC) Received: (qmail 52436 invoked by uid 500); 12 Jun 2014 19:54:28 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 52398 invoked by uid 500); 12 Jun 2014 19:54:28 -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 52368 invoked by uid 99); 12 Jun 2014 19:54:28 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jun 2014 19:54:28 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7C9088C3481; Thu, 12 Jun 2014 19:54:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Thu, 12 Jun 2014 19:54:27 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [06/10] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0 Merge branch 'cassandra-1.2' into cassandra-2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d81ac5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d81ac5e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d81ac5e Branch: refs/heads/cassandra-2.0 Commit: 3d81ac5ecd019704b687a829e6ed90c3d05326e6 Parents: daf6f68 d509fe1 Author: Brandon Williams Authored: Thu Jun 12 14:53:47 2014 -0500 Committer: Brandon Williams Committed: Thu Jun 12 14:53:47 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/FailureDetector.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d81ac5e/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------