Remove avro usage in DataOutputTest
Merge branch 'cassandra-2.1' into trunk
Fix SSTable not released if stream fails before it starts

patch by yukim; reviewed by Richard Low for CASSANDRA-6818
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Clean up CFMetaData

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6506
Clean up OnDiskAtom and implementations

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6506
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/AlterTableStatement.java
	src/java/org/apache/cassandra/cql/DropIndexStatement.java
	src/java/org/apache/cassandra/cql/QueryProcessor.java
Fix typo in DeletionInfo
Update versions and NEWS for 1.2.16 release
remove dead code
Merge branch 'cassandra-2.1' into trunk
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