Add forgotten test
Merge branch 'cassandra-1.2' into cassandra-2.0
Add forgotten test
Merge branch 'cassandra-2.0' into cassandra-2.1
sstableloader fails to stream data
Patch by Vijay, reviewed by Yuki Morishita for CASSANDRA-6965
update logback to version 1.1.2
Continue with assassinate even if the endpoint vanishes during the
sleep-for-safety check.

Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6787
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Lock counter cells, not partitions

patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-6880
Fix BTree.clear for large updates
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6943
Fix bad merge of 6825 into cassandra-2.1

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-6978
Fix SSTable not released if stream session fails

patch by yukim; reviewed by Richard Low for CASSANDRA-6818
Merge branch 'cassandra-2.0' into cassandra-2.1
fix test compile
if relocate is a no-op, don't try to op.
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Revert "Fix LatencyMetrics returning infinity."

This reverts commit 5e51aa4e6d1d868bb82a1aa2ffaed4613b24ffc1.
getRecentLatency returns zero instead of infinity

Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-6920