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/0656924f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0656924f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0656924f Branch: refs/heads/trunk Commit: 0656924fc5feb736f219fdf2dba2138a7a209dcd Parents: f85df37 6770281 Author: Marcus Eriksson <[email protected]> Authored: Thu Apr 30 13:06:39 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Thu Apr 30 13:06:39 2015 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/compaction/AbstractCompactionStrategy.java | 3 +++ .../db/compaction/DateTieredCompactionStrategy.java | 8 ++++++++ 3 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0656924f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0656924f/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0656924f/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java ----------------------------------------------------------------------
