Merge branch 'cassandra-2.1' into trunk
Conflicts:
test/unit/org/apache/cassandra/db/CommitLogTest.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ce22428
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ce22428
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ce22428
Branch: refs/heads/trunk
Commit: 7ce2242846a77ecb1285e3e26deb8b6c4974be10
Parents: 3c6e33e 54c6e66
Author: Jake Luciani <j...@apache.org>
Authored: Tue Aug 12 10:11:09 2014 -0400
Committer: Jake Luciani <j...@apache.org>
Committed: Tue Aug 12 10:11:09 2014 -0400
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/ColumnFamilyStore.java | 23 +++++++++++----
.../org/apache/cassandra/db/CommitLogTest.java | 30 ++++++++++++++++++++
3 files changed, 49 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ce22428/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ce22428/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7ce22428/test/unit/org/apache/cassandra/db/CommitLogTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java
index a919c85,ed9601d..fba86f6
--- a/test/unit/org/apache/cassandra/db/CommitLogTest.java
+++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java
@@@ -42,10 -40,11 +42,13 @@@ import org.apache.cassandra.db.commitlo
import org.apache.cassandra.db.commitlog.ReplayPosition;
import org.apache.cassandra.db.commitlog.CommitLogSegment;
import org.apache.cassandra.db.composites.CellName;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.locator.SimpleStrategy;
+ import org.apache.cassandra.db.composites.CellNameType;
+ import org.apache.cassandra.db.filter.NamesQueryFilter;
import org.apache.cassandra.net.MessagingService;
import org.apache.cassandra.service.StorageService;
+ import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import static org.apache.cassandra.utils.ByteBufferUtil.bytes;
