Add back Netty 3 jar to stress lib dir for #6911
Merge branch 'cassandra-2.1' into trunk
typo
Revert "Add CqlRecordReader to take advantage of native CQL pagination"

This reverts commit 3b708f9989274cbe9e0e2a5fda6f1d0a3d96ebee.

Conflicts:

	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	build.xml
Merge branch 'cassandra-2.1' into trunk
Fix UnsupportedOperationException on CAS timeout

patch by slebresne; reviewed by jbellis for CASSANDRA-6923
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fail write instead of logging a warning when unable to append to CL
patch by John Carrino; reviewed by jbellis for CASSANDRA-6764
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Merge remote-tracking branch 'origin/trunk' into trunk
typo
Merge branch 'cassandra-2.0' into cassandra-2.1
update comments for partitioner and snitch
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Improve MeteredFlusher handling of MF-unaffected column families

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6867
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/MeteredFlusher.java