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 CD88918559 for ; Thu, 7 Jan 2016 10:24:37 +0000 (UTC) Received: (qmail 57468 invoked by uid 500); 7 Jan 2016 10:24:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 57416 invoked by uid 500); 7 Jan 2016 10:24:37 -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 57087 invoked by uid 99); 7 Jan 2016 10:24:37 -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, 07 Jan 2016 10:24:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4AD4CE1870; Thu, 7 Jan 2016 10:24:37 +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: Thu, 07 Jan 2016 10:24:39 -0000 Message-Id: In-Reply-To: <9d7cc7278d834053b7d5bdcc5b8d1002@git.apache.org> References: <9d7cc7278d834053b7d5bdcc5b8d1002@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] cassandra git commit: Merge branch 'cassandra-3.3' into trunk Merge branch 'cassandra-3.3' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6ec5d55b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ec5d55b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6ec5d55b Branch: refs/heads/trunk Commit: 6ec5d55b9100cdfd6b4d2c67018442abd5ac1b04 Parents: 25090c1 ffc0840 Author: Sylvain Lebresne Authored: Thu Jan 7 11:24:25 2016 +0100 Committer: Sylvain Lebresne Committed: Thu Jan 7 11:24:25 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/6ec5d55b/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------