| commit | 929438b8be32e38f6d921bfdc4a011cd526dfeb7 | [log] [tgz] |
|---|---|---|
| author | Marcus Eriksson <marcuse@apache.org> | Mon Aug 10 09:12:52 2015 +0200 |
| committer | Marcus Eriksson <marcuse@apache.org> | Mon Aug 10 09:13:01 2015 +0200 |
| tree | db9fb5e8645a9f7624d7466b8e99c23893414453 | |
| parent | e389dc421c0a4892388e99c1ada0b4c37f106b7b [diff] | |
| parent | 9c3b967e7186c1c3b6f1c25c627e770187020344 [diff] |
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/config/CFMetaData.java src/java/org/apache/cassandra/db/compaction/CompactionStrategyManager.java test/unit/org/apache/cassandra/db/compaction/CompactionsCQLTest.java