add deprecation warning to cli
Follow-up for 6327

patch by krummas; reviewed by slebresne for CASSANDRA-6327
Fix AssertionError when doing set element deletion

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6341
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Make the CL native protocol code match the on in 2.0

patch by slebresne; reviewed by jasobrown for CASSANDRA-6347
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/ConsistencyLevel.java
Merge branch 'cassandra-2.0' into trunk
SSTable/SSTableReader cleanup

patch by yukim; reviewed by jbellis for CASSANDRA-6355
Recover from IOException in accept() thread
patch by Mihial Stepura; reviewed by jbellis for CASSANDRA-6349
Merge branch 'cassandra-2.0' into trunk
free off-heap IndexSummary during bulk load
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-6359
Merge branch 'cassandra-2.0' into trunk
Cancel read meter task when closing SSTR
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-6358
Merge branch 'cassandra-2.0' into trunk
Invalidate row cache when dropping CF
patch by Fabien Rousseau; reviewed by jbellis for CASSANDRA-6351
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Merge remote-tracking branch 'upstream/trunk' into trunk