Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/09147a8b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/09147a8b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/09147a8b Branch: refs/heads/trunk Commit: 09147a8b6c2ced97a05d185c02bedbf1a59978e1 Parents: ee186b6 755a6b2 Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Aug 18 10:51:56 2015 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Aug 18 10:51:56 2015 +0200 ---------------------------------------------------------------------- .../DateTieredCompactionStrategy.java | 7 +++---- .../DateTieredCompactionStrategyOptions.java | 21 ++++++++++++++++++++ .../DateTieredCompactionStrategyTest.java | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09147a8b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/09147a8b/test/unit/org/apache/cassandra/db/compaction/DateTieredCompactionStrategyTest.java ----------------------------------------------------------------------
