cassandra git commit: Fix ColumnFamilyStoreTest.testSliceByNamesCommandOldMetadata

[jm...@apache.org]

Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 fdecab038 -> 06e742fc7


Fix ColumnFamilyStoreTest.testSliceByNamesCommandOldMetadata

Patch by jmckenzie; reviewed by jbellis for CASSANDRA-9501


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

Branch: refs/heads/cassandra-2.2
Commit: 06e742fc7ff531de4d3a6d17ec916a519182b671
Parents: fdecab0
Author: Josh McKenzie <jo...@datastax.com>
Authored: Fri May 29 13:35:17 2015 -0400
Committer: Josh McKenzie <jo...@datastax.com>
Committed: Fri May 29 13:35:17 2015 -0400

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/06e742fc/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
index 60fb195..c85b2e0 100644
--- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
+++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
@@ -1109,7 +1109,7 @@ public class ColumnFamilyStoreTest
         CellName cname = cellname("c1");
         Keyspace keyspace = Keyspace.open(keyspaceName);
         ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(cfName);
-        cfs.clearUnsafe();
+        cfs.truncateBlocking();
 
         // Create a cell a 'high timestamp'
         putColsStandard(cfs, key, new BufferCell(cname, ByteBufferUtil.bytes("a"), 2));