Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91e3d342 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91e3d342 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91e3d342 Branch: refs/heads/trunk Commit: 91e3d34210e593f3ae03070865d1f346f3b3bac7 Parents: 30a704e 6c69f07 Author: Marcus Eriksson <[email protected]> Authored: Tue Aug 18 10:59:53 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Aug 18 10:59:53 2015 +0200 ---------------------------------------------------------------------- .../DateTieredCompactionStrategy.java | 7 +++---- .../DateTieredCompactionStrategyOptions.java | 21 ++++++++++++++++++++ .../DateTieredCompactionStrategyTest.java | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
