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 45CA6183E0 for ; Thu, 17 Sep 2015 01:40:36 +0000 (UTC) Received: (qmail 41430 invoked by uid 500); 17 Sep 2015 01:40:35 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 41340 invoked by uid 500); 17 Sep 2015 01:40:35 -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 40897 invoked by uid 99); 17 Sep 2015 01:40:35 -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; Thu, 17 Sep 2015 01:40:35 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 36716E0613; Thu, 17 Sep 2015 01:40:35 +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, 17 Sep 2015 01:40:41 -0000 Message-Id: <4c2c67d086ef4a1ebdcd216b725b354b@git.apache.org> In-Reply-To: <5375fe42e74c4badb688dc59ac708a2b@git.apache.org> References: <5375fe42e74c4badb688dc59ac708a2b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/15] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1 Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ba5837ea Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ba5837ea Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ba5837ea Branch: refs/heads/cassandra-2.1 Commit: ba5837ea25018f17e2a656e6ead7a0585053e574 Parents: e889ee4 718e47f Author: Brandon Williams Authored: Wed Sep 16 20:39:39 2015 -0500 Committer: Brandon Williams Committed: Wed Sep 16 20:39:39 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ba5837ea/src/java/org/apache/cassandra/gms/FailureDetector.java ----------------------------------------------------------------------