Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 585B3200C15 for ; Tue, 3 Jan 2017 19:05:50 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 57146160B48; Tue, 3 Jan 2017 18:05:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CC9A1160B20 for ; Tue, 3 Jan 2017 19:05:49 +0100 (CET) Received: (qmail 41439 invoked by uid 500); 3 Jan 2017 18:05: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 40783 invoked by uid 99); 3 Jan 2017 18:05:47 -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; Tue, 03 Jan 2017 18:05:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 162A1F3519; Tue, 3 Jan 2017 18:05:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jake@apache.org To: commits@cassandra.apache.org Date: Tue, 03 Jan 2017 18:05:58 -0000 Message-Id: <168cdc1ee8c34b4d945e4cfeb87a68de@git.apache.org> In-Reply-To: <61d94ebc0c3f448c88e438b809e082f5@git.apache.org> References: <61d94ebc0c3f448c88e438b809e082f5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [13/15] cassandra git commit: Merge branch 'cassandra-3.11' into cassandra-3.X archived-at: Tue, 03 Jan 2017 18:05:50 -0000 Merge branch 'cassandra-3.11' into cassandra-3.X Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/917d13f0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/917d13f0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/917d13f0 Branch: refs/heads/cassandra-3.X Commit: 917d13f00ff27d93ab50eeef30153f33ab98393f Parents: 4aa09eb 68f7ce4 Author: T Jake Luciani Authored: Tue Jan 3 13:04:32 2017 -0500 Committer: T Jake Luciani Committed: Tue Jan 3 13:04:32 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ .../org/apache/cassandra/locator/DynamicEndpointSnitch.java | 4 +--- .../apache/cassandra/locator/DynamicEndpointSnitchTest.java | 8 ++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/917d13f0/CHANGES.txt ----------------------------------------------------------------------