Fix typo in DeletionInfo
Update versions and NEWS for 1.2.16 release
Adds QueryHandler interface

patch by beobal & slebresne; reviewed by beobal & slebresne for CASSANDRA-6659
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/QueryProcessor.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/ClientState.java
Allow manually specifying start/end tokens in CFIF
patch by Paulo Gomes; reviewed by Piotr Kołaczkowski for CASSANDRA-6436
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Restrict Windows to parallel repairs
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-6907
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
cleanup
merge from 2.1
Remove adjusted op rate from stress output

patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko for
CASSANDRA-6921
Merge branch 'cassandra-2.1' into trunk
make WrappedRow static
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Get rid of redundant cfs arg in ABSC#cloneToHeap()
Remove user types rename for now