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/f60abbdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f60abbdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f60abbdd Branch: refs/heads/cassandra-2.2 Commit: f60abbdd5d5ddbf6e7afbfc5aece936da685ebcc Parents: 4765cd6 b724d1e Author: Marcus Eriksson <[email protected]> Authored: Mon Aug 3 21:34:24 2015 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Aug 3 21:34:24 2015 +0200 ---------------------------------------------------------------------- .../compaction/WrappingCompactionStrategy.java | 2 +- .../db/compaction/CompactionsCQLTest.java | 52 ++++++++++++++++++++ 2 files changed, 53 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f60abbdd/src/java/org/apache/cassandra/db/compaction/WrappingCompactionStrategy.java ----------------------------------------------------------------------
