Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92b40fd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92b40fd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92b40fd9 Branch: refs/heads/trunk Commit: 92b40fd90d9d590b738a325ee68ca80acfaa97f9 Parents: d6b5826 80b3e6c Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Apr 1 22:26:49 2014 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Apr 1 22:26:49 2014 +0200 ---------------------------------------------------------------------- .../cassandra/db/compaction/AbstractCompactionStrategy.java | 5 ++++- .../cassandra/db/compaction/SizeTieredCompactionStrategy.java | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b40fd9/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92b40fd9/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java ----------------------------------------------------------------------
