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/5995de3b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5995de3b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5995de3b Branch: refs/heads/trunk Commit: 5995de3b638fdd898ddfb94c3e8d2bf3ed3cf657 Parents: 7cedeca 27ca491 Author: Marcus Eriksson <[email protected]> Authored: Wed Oct 28 09:06:01 2015 +0100 Committer: Marcus Eriksson <[email protected]> Committed: Wed Oct 28 09:06:01 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../DateTieredCompactionStrategy.java | 46 +++++++----- .../DateTieredCompactionStrategyTest.java | 73 ++++++++++++++------ 3 files changed, 82 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5995de3b/CHANGES.txt ----------------------------------------------------------------------
