Return-Path: 
 <commits-return-91359-apmail-cassandra-commits-archive=cassandra.apache.org@cassandra.apache.org>
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 0003610938
	for <apmail-cassandra-commits-archive@www.apache.org>;
 Mon, 10 Feb 2014 17:39:30 +0000 (UTC)
Received: (qmail 29434 invoked by uid 500); 10 Feb 2014 17:39:30 -0000
Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org
Received: (qmail 29288 invoked by uid 500); 10 Feb 2014 17:39:29 -0000
Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cassandra.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cassandra.apache.org>
List-Post: <mailto:commits@cassandra.apache.org>
List-Id: <commits.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list commits@cassandra.apache.org
Received: (qmail 29246 invoked by uid 99); 10 Feb 2014 17:39:28 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Feb 2014 17:39:28 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 4306C9223BF; Mon, 10 Feb 2014 17:39:28 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: marcuse@apache.org
To: commits@cassandra.apache.org
Date: Mon, 10 Feb 2014 17:39:29 -0000
Message-Id: <351a93a542cd43cdbb478af46c57d01d@git.apache.org>
In-Reply-To: <5f31afc7de634eca9c98d81f40ef2910@git.apache.org>
References: <5f31afc7de634eca9c98d81f40ef2910@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	test/unit/org/apache/cassandra/db/CleanupTest.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9a6ae96a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a6ae96a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9a6ae96a

Branch: refs/heads/trunk
Commit: 9a6ae96af725e307d05332554f221c97e10647d1
Parents: b5321d5 4b83a6f
Author: Marcus Eriksson <marcuse@apache.org>
Authored: Mon Feb 10 18:34:43 2014 +0100
Committer: Marcus Eriksson <marcuse@apache.org>
Committed: Mon Feb 10 18:34:43 2014 +0100

----------------------------------------------------------------------
 test/unit/org/apache/cassandra/db/CleanupTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a6ae96a/test/unit/org/apache/cassandra/db/CleanupTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java
index 562df1e,d5c2b07..9914c90
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@@ -64,10 -64,9 +64,10 @@@ public class CleanupTest extends Schema
      @Test
      public void testCleanup() throws IOException, ExecutionException, InterruptedException, ConfigurationException
      {
-         StorageService.instance.initServer(0);
+         StorageService.instance.getTokenMetadata().clearUnsafe();
 -        Table table = Table.open(TABLE1);
 -        ColumnFamilyStore cfs = table.getColumnFamilyStore(CF2);
 +
 +        Keyspace keyspace = Keyspace.open(KEYSPACE1);
 +        ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF2);
  
          List<Row> rows;