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 792DD180D5 for ; Tue, 5 Jan 2016 14:28:57 +0000 (UTC) Received: (qmail 95679 invoked by uid 500); 5 Jan 2016 14:28:56 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95612 invoked by uid 500); 5 Jan 2016 14:28:56 -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 94861 invoked by uid 99); 5 Jan 2016 14:28:55 -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, 05 Jan 2016 14:28:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC13DE0AF6; Tue, 5 Jan 2016 14:28:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: slebresne@apache.org To: commits@cassandra.apache.org Date: Tue, 05 Jan 2016 14:29:01 -0000 Message-Id: <393bb832eef54c76ae3093c3da23ce88@git.apache.org> In-Reply-To: <24e2a81550224177b06d26123412962f@git.apache.org> References: <24e2a81550224177b06d26123412962f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/20] 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/5ad8010a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ad8010a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5ad8010a Branch: refs/heads/trunk Commit: 5ad8010a64d7176820b9be7cd46949eb710f9661 Parents: 1d7bacc 6ff1cbb Author: Sylvain Lebresne Authored: Tue Jan 5 15:23:22 2016 +0100 Committer: Sylvain Lebresne Committed: Tue Jan 5 15:23:22 2016 +0100 ---------------------------------------------------------------------- .../apache/cassandra/locator/TokenMetadata.java | 61 ++++++++++---------- .../cassandra/service/StorageService.java | 2 +- 2 files changed, 32 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad8010a/src/java/org/apache/cassandra/locator/TokenMetadata.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5ad8010a/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------