comment CqlRow for #6807
Merge branch 'cassandra-1.2' into cassandra-2.0
CASSANDRA-6876 follow-up
Add CqlRecordReader to take advantage of native CQL pagination

patch by alexliu68; reviewed by pkolaczk for CASSANDRA-6311
Fix paging with SELECT DISTINCT

patch by slebresne; reviewed by thobbs for CASSANDRA-6857
Allow deleting snapshots from dropped keyspaces
patch by Lyuben Todorov; reviewed by Nick Bailey for CASSANDRA-6281
Make cqlsh prompt for a password if the user doesn't enter one.

patch by J.B. Langston; reviewed by Mikhail Stepura for CASSANDRA-6902
inline
Fix race processing range scan responses
patch by jbellis; reviewed by mstepura and ayeschenko for CASSANDRA-6820
add asserts
Fix NPE in MeteredFlusher
patch by Nicolas Favre-Felix; reviewed by jbellis for CASSANDRA-6820
nodetool status should issue a warning when no keyspace is specified
patch by Vijay; reviewed by Brandon Williams for CASSANDRA-6168
Merge branch 'cassandra-1.2' into cassandra-2.0
status output is confused when hostname resolution is enabled
patch by Vijay; reviewed by Brandon Williams for CASSANDRA-6896
Merge branch 'cassandra-1.2' into cassandra-2.0
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
Fix typo in DeletionInfo
Update versions and NEWS for 1.2.16 release
Revert "Add CqlRecordReader to take advantage of native CQL pagination"

This reverts commit 3b708f9989274cbe9e0e2a5fda6f1d0a3d96ebee.

Conflicts:

	CHANGES.txt