Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Merge remote-tracking branch 'origin/trunk' into trunk
Storage Proxy should register instance not new instance
patch by Ed Capriolo; reviewed by jbellis for CASSANDRA-6856
Merge branch 'cassandra-2.1' into trunk
Fix failing pig test

Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6376
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix truncate to not abort due to unreachable fat clients
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6864
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Log more information when exceeding tombstone_warn_threshold
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6865
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
fix merge
Merge branch 'cassandra-2.1' into trunk
Fix "codecoverage" task
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
fix path variable
presize collection