| commit | 730cc60640a683ef455c1b8856e4ed8fc39a460f | [log] [tgz] |
|---|---|---|
| author | Marcus Eriksson <marcuse@apache.org> | Wed Apr 01 14:39:50 2015 +0200 |
| committer | Marcus Eriksson <marcuse@apache.org> | Wed Apr 01 14:39:50 2015 +0200 |
| tree | 6df4e1be86374b53d95edaef949b90e1245f6690 | |
| parent | 0ba5f2721b8d6b57592532654d8533acb9964807 [diff] | |
| parent | 2cf4ca3a94ff972b422f1be1a2d601d07ff31a12 [diff] |
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/compaction/CompactionTask.java