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/a562394c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a562394c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a562394c Branch: refs/heads/trunk Commit: a562394ce04b32bec5d3e4270481850ea8610ae5 Parents: b96adb9 48847b5 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Tue Mar 25 22:03:11 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Tue Mar 25 22:03:11 2014 +0300 ---------------------------------------------------------------------- .../db/compaction/AbstractCompactionStrategy.java | 10 ++++++++++ 1 file changed, 10 insertions(+) ----------------------------------------------------------------------
