Fix help message for stress counter_write
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6824
Ninja-commit for "Add LZ4Compressor in CQL document" CASSANDRA-6331
Merge branch 'cassandra-2.0' into cassandra-2.1
Fix stress smart Thrift client to pick servers correctly
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6848
Add logging levels (minimal, normal or verbose) to stress tool
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6849
fix duplicate classes between cassandra-all and cassandra-thrift

patch by dbrosius reviewed by jbellis for CASSANDRA-5833
Merge branch 'cassandra-2.0' into cassandra-2.1
Eliminate possibility of CL segment appearing twice in active list
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6557
Read message id as string from older nodes.

Patch by marcuse, reviewed by jbellis for CASSANDRA-6840
Merge branch 'cassandra-2.0' into cassandra-2.1
Fix schema concurrency exceptions
patch by Benedict Elliott Smith; reviewed by Carl Yeksigian for CASSANDRA-6841
Race condition in Batch CLE

patch by belliottsmith reviewed by dbrosius for cassandra-6860
merge from 2.0
Fix schema concurrency exceptions
patch by Benedict Elliott Smith; reviewed by Carl Yeksigian for CASSANDRA-6841
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Storage Proxy should register instance not new instance
patch by Ed Capriolo; reviewed by jbellis for CASSANDRA-6856
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