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 C30BB11783 for ; Sat, 16 Aug 2014 05:17:49 +0000 (UTC) Received: (qmail 79558 invoked by uid 500); 16 Aug 2014 05:17:49 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 79484 invoked by uid 500); 16 Aug 2014 05:17:49 -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 79175 invoked by uid 99); 16 Aug 2014 05:17:49 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Aug 2014 05:17:49 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id B7B098AE930; Sat, 16 Aug 2014 05:17:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: benedict@apache.org To: commits@cassandra.apache.org Date: Sat, 16 Aug 2014 05:17:51 -0000 Message-Id: In-Reply-To: <1f0d1a983c664f95bc947fafbc782bcb@git.apache.org> References: <1f0d1a983c664f95bc947fafbc782bcb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] 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/fe057277 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe057277 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fe057277 Branch: refs/heads/trunk Commit: fe0572778cd4449d3c3d850931f9d41a454b8994 Parents: ba22af1 8a69ef8 Author: Benedict Elliott Smith Authored: Sat Aug 16 12:17:28 2014 +0700 Committer: Benedict Elliott Smith Committed: Sat Aug 16 12:17:28 2014 +0700 ---------------------------------------------------------------------- CHANGES.txt | 5 ++ .../cassandra/streaming/StreamTransferTask.java | 83 ++++++++++++-------- .../streaming/StreamTransferTaskTest.java | 17 +++- 3 files changed, 67 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe057277/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/fe057277/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java index 5d246f4,cc41a8b..16fa77b --- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java @@@ -22,11 -24,10 +24,12 @@@ import java.util.concurrent.Future import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import org.junit.BeforeClass; import org.junit.Test; + import junit.framework.Assert; import org.apache.cassandra.SchemaLoader; +import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.Range;