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/87321cd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87321cd6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87321cd6 Branch: refs/heads/trunk Commit: 87321cd6d0b07c376899854d1bfc6355220ae1cf Parents: e3fa11b 5f0413b Author: Jake Luciani <j...@apache.org> Authored: Fri Aug 1 11:17:41 2014 -0400 Committer: Jake Luciani <j...@apache.org> Committed: Fri Aug 1 11:17:41 2014 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java | 5 +++ .../apache/cassandra/db/ColumnFamilyStore.java | 23 +++----------- test/conf/cassandra.yaml | 1 + .../org/apache/cassandra/db/CommitLogTest.java | 32 ++++++++++++++++++++ 5 files changed, 44 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87321cd6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87321cd6/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87321cd6/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87321cd6/test/unit/org/apache/cassandra/db/CommitLogTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/CommitLogTest.java index f8cb8c8,a58549a..a919c85 --- a/test/unit/org/apache/cassandra/db/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java @@@ -35,15 -35,14 +36,17 @@@ import org.apache.cassandra.SchemaLoade import org.apache.cassandra.Util; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; +import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.commitlog.CommitLogDescriptor; + 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.net.MessagingService; import org.apache.cassandra.service.StorageService; + import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.utils.ByteBufferUtil.bytes;