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/13701656 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/13701656 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/13701656 Branch: refs/heads/trunk Commit: 1370165662e843d87c4a78ee75c59b13bf4db0fa Parents: 8e808ae 994eb2f Author: Marcus Eriksson <[email protected]> Authored: Tue Mar 31 12:53:19 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Mar 31 12:53:19 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../compaction/DateTieredCompactionStrategy.java | 18 ++++++++++++++---- .../DateTieredCompactionStrategyTest.java | 7 +++++-- 3 files changed, 20 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13701656/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13701656/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/13701656/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ----------------------------------------------------------------------
