Add timeout events to query traces
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5520
Optimized data structure for range tombstones

patch by slebresne; reviewed by frousseau for CASSANDRA-5677
Fix querying with an empty (impossible) range

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5573
Remove commented code
add cassandra-shuffle.bat
Fix potential index out of bound error in RangeTombstoneList (+test)
cqlsh: handle CUSTOM 2i in DESCRIBE output

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5760
Add replace_token functionality for vnodes.
Patch by brandonwilliams reviewed by jasobrown for CASSANDRA-5337
fix build
invert replace condition
quote identifiers in CqlPagingRecordReader
patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-5763
replace string concatenation with modern logging and String.format
another inverted condition
add cassandra.unsafetruncate property
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-5704
Print cluster name in describe cluster.
Patch by Philip Crotwell, reviewed by brandonwilliams for CASSANDRA-5773
Fix bug in Range.intersects(Bound)

patch by slebresne; reviewed by jbellis for CASSANDRA-5771
Kill CLI mentions in DD log messages
update unsafetruncate -> unsafesystem
patch by Christian Spriegel and jbellis for CASSANDRA-5704