You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/10/30 01:14:47 UTC
[1/3] git commit: fix test, take 2
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 b6c9c35c3 -> 62688d1f1
refs/heads/trunk a2c4caa00 -> 3329cd79a
fix test, take 2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62688d1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62688d1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62688d1f
Branch: refs/heads/cassandra-2.1
Commit: 62688d1f15e9ba20e22d42b0527e3a359a96386e
Parents: b6c9c35
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Oct 29 19:13:51 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Oct 29 19:13:51 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/62688d1f/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 c91ed27..9181dc0 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.format.SSTableReader;
+import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.utils.ByteBufferUtil;
import static org.junit.Assert.assertEquals;
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
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/3329cd79
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3329cd79
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3329cd79
Branch: refs/heads/trunk
Commit: 3329cd79a80f09da1932a772b3615080fde06830
Parents: a2c4caa 62688d1
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Oct 29 19:14:00 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Oct 29 19:14:00 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: fix test, take 2
Posted by yu...@apache.org.
fix test, take 2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/62688d1f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/62688d1f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/62688d1f
Branch: refs/heads/trunk
Commit: 62688d1f15e9ba20e22d42b0527e3a359a96386e
Parents: b6c9c35
Author: Yuki Morishita <yu...@apache.org>
Authored: Wed Oct 29 19:13:51 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Wed Oct 29 19:13:51 2014 -0500
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ColumnFamilyMetricTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/62688d1f/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 c91ed27..9181dc0 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.format.SSTableReader;
+import org.apache.cassandra.io.sstable.SSTableReader;
import org.apache.cassandra.utils.ByteBufferUtil;
import static org.junit.Assert.assertEquals;