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 8C31817A37 for ; Fri, 17 Apr 2015 22:39:04 +0000 (UTC) Received: (qmail 72025 invoked by uid 500); 17 Apr 2015 22:39:04 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 71982 invoked by uid 500); 17 Apr 2015 22:39:04 -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 71941 invoked by uid 99); 17 Apr 2015 22:39:04 -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; Fri, 17 Apr 2015 22:39:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 32CBEE04E6; Fri, 17 Apr 2015 22:39:04 +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: Fri, 17 Apr 2015 22:39:07 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [4/4] cassandra 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/4040ba8e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4040ba8e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4040ba8e Branch: refs/heads/trunk Commit: 4040ba8e7bd290881f16d1f7b4161b744998364b Parents: 11dfc02 a925262 Author: Brandon Williams Authored: Fri Apr 17 17:38:56 2015 -0500 Committer: Brandon Williams Committed: Fri Apr 17 17:38:56 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/locator/ReconnectableSnitchHelper.java | 9 +++------ 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4040ba8e/CHANGES.txt ----------------------------------------------------------------------