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
Improve error message
Disallow updating CQL3 tables from thrift

patch by slebresne; reviewed by jbellis for CASSANDRA-6370
Fix size computation of prepared statements

patch by slebresne; reviewed by lyubent for CASSANDRA-6369
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/thrift/CassandraServer.java
Fix typo
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/thrift/CassandraServer.java
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
adding affinity classes,a dn hacking NTF to use ESCAS
turning off cpu affinity
making ESCAS the default (more or less) so I can test it out again
adding ability to ban cpus from ESCAS