Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2eb7bd7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2eb7bd7
Diff:
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/972ae147
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/972ae147
Diff:
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1ae58ef3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ae58ef3
Diff:
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83c0e01a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/83c0e01a
Diff:
Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
CHANGES.txt
src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
test/unit/org/apache/cassandra/db/compaction/BlacklistingCompactionsTest.java
Project:
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49d5c8d9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49d5c8d9
Diff: