Updated Branches: refs/heads/cassandra-1.0 9b746daf7 -> 142e8c1a2 refs/heads/cassandra-1.1 092dc586f -> 6564b33c7 refs/heads/cassandra-1.1.0 0d1d3bca1 -> c14e266eb refs/heads/trunk f774b7fc3 -> 8f9b37c3d
merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8f9b37c3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8f9b37c3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8f9b37c3 Branch: refs/heads/trunk Commit: 8f9b37c3dd73fde832b865843ae447a2451e6e70 Parents: f774b7f 6564b33 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Apr 11 09:12:55 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Apr 11 09:12:55 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 3 +++ conf/cassandra.yaml | 6 ++++++ .../org/apache/cassandra/thrift/Cassandra.java | 4 ++++ .../org/apache/cassandra/thrift/Constants.java | 2 +- src/java/org/apache/cassandra/config/Config.java | 1 + .../cassandra/config/DatabaseDescriptor.java | 4 ++++ .../org/apache/cassandra/db/ColumnFamilyStore.java | 3 ++- src/java/org/apache/cassandra/db/DefsTable.java | 6 ++++-- .../db/compaction/CompactionController.java | 2 +- 9 files changed, 26 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9b37c3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9b37c3/src/java/org/apache/cassandra/config/Config.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9b37c3/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9b37c3/src/java/org/apache/cassandra/db/ColumnFamilyStore.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9b37c3/src/java/org/apache/cassandra/db/DefsTable.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8f9b37c3/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionController.java index f7d5354,9eaefe7..402deaa --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@@ -26,15 -26,14 +26,15 @@@ import org.slf4j.Logger import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.*; +import org.apache.cassandra.db.ColumnFamilyStore; +import org.apache.cassandra.db.DataTracker; +import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.io.sstable.SSTableIdentityIterator; import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.service.CacheService; import org.apache.cassandra.service.StorageService; --import org.apache.cassandra.utils.Throttle; import org.apache.cassandra.utils.IntervalTree.Interval; import org.apache.cassandra.utils.IntervalTree.IntervalTree; ++import org.apache.cassandra.utils.Throttle; /** * Manage compaction options.