Fix merge on test
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b6c9c35c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b6c9c35c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b6c9c35c Branch: refs/heads/trunk Commit: b6c9c35c33771f2664687fcead22905e6c786e37 Parents: 391f1d3 Author: Yuki Morishita <yu...@apache.org> Authored: Wed Oct 29 19:07:12 2014 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Wed Oct 29 19:07:12 2014 -0500 ---------------------------------------------------------------------- test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b6c9c35c/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java index e3e81d8..c91ed27 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java @@ -23,7 +23,7 @@ import java.util.Collection; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.io.sstable.SSTableReader; +import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.ByteBufferUtil; import static org.junit.Assert.assertEquals; @@ -47,7 +47,7 @@ public class ColumnFamilyMetricTest extends SchemaLoader { ByteBuffer key = ByteBufferUtil.bytes(String.valueOf(j)); Mutation rm = new Mutation("Keyspace1", key); - rm.add("Standard2", cellname("0"), ByteBufferUtil.EMPTY_BYTE_BUFFER, j); + rm.add("Standard1", cellname("0"), ByteBufferUtil.EMPTY_BYTE_BUFFER, j); rm.apply(); } store.forceBlockingFlush();
