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
Make commitlog archiver thread pool name consistent

Patch by Chris Lohfink, reviewed by brandonwilliams for CASSANDRA-7043
Clean up isUnix function and force standard disk access on Windows
error on logging is a tad aggressive.
Clean up isUnix function and force standard disk access on Windows
revising log msg to be non-unix instead of Windows
revising per feedback on ticket
cleaned things up as per ticket feedback
Merge branch '6993-trunk' of https://github.com/josh-mckenzie/cassandra into 6993-trunk

Conflicts:
	src/java/org/apache/cassandra/utils/FBUtilities.java