don't mention unneeded token escaping
Merge branch 'cassandra-2.1' into trunk
Fix performance regression from CASSANDRA-5614

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6949
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
Merge branch 'cassandra-2.1' into trunk
Use LOCAL_QUORUM fordata reads at LOCAL_SERIAL
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6939
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Ensure that batchlog and hint timeouts do not produce hints

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7058
Make commitlog archiver thread pool name consistent

Patch by Chris Lohfink, reviewed by brandonwilliams for CASSANDRA-7043
Make commitlog archiver thread pool name consistent

Patch by Chris Lohfink, reviewed by brandonwilliams for CASSANDRA-7043
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/net/MessagingService.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
fix cassandra stress errors on reads with native protocol

patch by belliottsmith; reviewed by jasobrown for CASSANDRA-7033
force Windows to use non-mapped i/o
patch by Josh McKenzie; reviewed by Benedict Elliott Smith for CASSANDRA-6993
merged cassandra-2.1 to trunk (for CASSANDRA-7033)
Post-CASSANDRA-7058 fix
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/service/StorageProxy.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java
	tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java