r/m unused code from ThriftServer/TServerFactory
patch by Ed Capriolo; reviewed by jbellis for CASSANDRA-6854
ByteBuffer write() methods for serializing sstables

Patch by benedict, reviewed by marcuse for CASSANDRA-6781
comment CqlRow for #6807
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Add proper compare function for CollectionType (for UDT sake)

patch by slebresne; reviewed by thobbs for CASSANDRA-6783
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1

Conflicts:
	CHANGES.txt
Remove unused import
CASSANDRA-6876 follow-up
Merge branch 'cassandra-2.0' into cassandra-2.1
Update native server to Netty 4

patch by benedict; reviewed by slebresne for CASSANDRA-6236
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Fix off-by-one error in stress

patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko for
CASSANDRA-6883
Make OpOrder AutoCloseable

Patch by benedict, reviewed by marcuse for CASSANDRA-6901.
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:
	build.xml
Fix paging with SELECT DISTINCT

patch by slebresne; reviewed by thobbs for CASSANDRA-6857
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
Allow deleting snapshots from dropped keyspaces
patch by Lyuben Todorov; reviewed by Nick Bailey for CASSANDRA-6281