fix addCallback for XDC requests too
merge from 1.2
one more consistencyLevel to pass along
merge from 1.2
last one?
Merge branch 'cassandra-1.2' into cassandra-2.0
Use Java7 file APIs to get saner exceptions etc.

And since windows does not support moving a file on top of another
existing file, remove the old file before moving.

Patch by marcuse, reviewed by jbellis for CASSANDRA-5383.
comment
Revert CASSANDRA-6132 (pushing to 2.0 only)
Merge branch 'cassandra-1.2' into cassandra-2.0
add consistencyLevel to callback in mutateCounter
fix CME in StreamResultFuture
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6129
Expose connected thrift + native client counts
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-5084
merge from 1.2
Limit CQL prepared statement cache by size instead of count
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-6107
merge from 1.2
fix build
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix SP.sendToHintedEndpoints() javadoc
Merge branch 'cassandra-1.2' into cassandra-2.0