Merge branch 'cassandra-2.0' into cassandra-2.1
Conflicts:
build.xml
debian/changelog
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b84d06f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tre
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/432b7319
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/432b7319
Diff: http://git-wip-us.apache.org/repos/asf
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/2777e1e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2777e1e5
Diff: http://git-wip-us.apache.org/repos/asf