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 98E561811C for ; Fri, 8 Jan 2016 14:29:15 +0000 (UTC) Received: (qmail 49635 invoked by uid 500); 8 Jan 2016 14:29:12 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 49575 invoked by uid 500); 8 Jan 2016 14:29:12 -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 48704 invoked by uid 99); 8 Jan 2016 14:29: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; Fri, 08 Jan 2016 14:29:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 0B4B4E3852; Fri, 8 Jan 2016 14:29:12 +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: Fri, 08 Jan 2016 14:29:32 -0000 Message-Id: In-Reply-To: <991640341bb846e68b357275a3059207@git.apache.org> References: <991640341bb846e68b357275a3059207@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [22/22] 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/267ab31d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/267ab31d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/267ab31d Branch: refs/heads/trunk Commit: 267ab31dbd5b9a59dab6a60893ad13f30444f238 Parents: ea3ba68 3ad6090 Author: Sylvain Lebresne Authored: Fri Jan 8 15:28:27 2016 +0100 Committer: Sylvain Lebresne Committed: Fri Jan 8 15:28:27 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/dht/Range.java | 21 + .../apache/cassandra/locator/TokenMetadata.java | 34 +- test/unit/org/apache/cassandra/Util.java | 4 +- .../org/apache/cassandra/dht/RangeTest.java | 55 ++ .../org/apache/cassandra/service/MoveTest.java | 496 ++++++++++++++++++- 6 files changed, 581 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/267ab31d/CHANGES.txt ----------------------------------------------------------------------