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/b09e3929 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b09e3929 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b09e3929 Branch: refs/heads/trunk Commit: b09e39295cdd26690a7d6f9a7c5417c26e9376fc Parents: 7f0a854 52191eb Author: Marcus Eriksson <[email protected]> Authored: Wed Apr 1 12:56:34 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Wed Apr 1 12:56:34 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../DateTieredCompactionStrategy.java | 31 ++++++++++---- .../DateTieredCompactionStrategyTest.java | 43 ++++++++++++++++++++ 3 files changed, 67 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b09e3929/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b09e3929/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b09e3929/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ----------------------------------------------------------------------
