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 30F7B19BBE for ; Thu, 21 Apr 2016 20:33:13 +0000 (UTC) Received: (qmail 56307 invoked by uid 500); 21 Apr 2016 20:33:13 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 56276 invoked by uid 500); 21 Apr 2016 20:33:13 -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 56242 invoked by uid 99); 21 Apr 2016 20:33:12 -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, 21 Apr 2016 20:33:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 83640DFF73; Thu, 21 Apr 2016 20:33:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tylerhobbs@apache.org To: commits@cassandra.apache.org Date: Thu, 21 Apr 2016 20:33:13 -0000 Message-Id: In-Reply-To: <75e64ef27e1f4ec2b9a3c19ae94d72b3@git.apache.org> References: <75e64ef27e1f4ec2b9a3c19ae94d72b3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0 Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d8d920dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d8d920dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d8d920dc Branch: refs/heads/cassandra-3.0 Commit: d8d920dce9044a064691ee30ef7de3bd11114cad Parents: caae987 c42f5f6 Author: Tyler Hobbs Authored: Thu Apr 21 15:32:51 2016 -0500 Committer: Tyler Hobbs Committed: Thu Apr 21 15:32:51 2016 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/gms/FailureDetector.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------