[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

[marcuse]

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 <marc...@apache.org>
Authored: Mon Feb 10 18:34:43 2014 +0100
Committer: Marcus Eriksson <marc...@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;