typo
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
Merge branch 'cassandra-2.1' into trunk
Add multiple memory allocation options for memtables
patch by benedict and xedin; reviewed by marcuse and xedin for CASSANDRA-6689
fix problem with localCopy methods after CASSANDRA-6689
Merge branch 'cassandra-2.1' into trunk
remove dead parms on private methods
Merge branch 'cassandra-2.1' into trunk
Add CqlRecordReader to take advantage of native CQL pagination

patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	build.xml