Apache Cassandra 2.1.0-rc6 release
Merge branch 'cassandra-2.0' into cassandra-2.1.0