prefer Iterators to CollectionUtils
apply BTree update function correctly
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6692
Merge branch 'cassandra-2.1' into trunk
clean up Path and Cursor now that we know stack allocation doesn't work as expected
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6692
Merge branch 'cassandra-2.1' into trunk
Fix stress to do proper counter reads
Patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6835
Move ByteBuffer functions to ByteBufferUtil and avoid duplication
add #2635 to CHANGES
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Minor tweaks for 'caching' option
fix nodetool getsstables for blob PK
patch by Nate McCall; reviewed by jbellis for CASSANDRA-6803
merge from 1.2
merge from 2.0
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Python-driver without a hard dependency on `scales`
Fix leaking validator FH in StreamWriter
patch by Joshua McKenzie; reviewed by jbellis for CASSANDRA-6832
merge from 2.0
Load a truststore if client certificate authentication is enabled

patch by Mikhail Stepura; reviewed by Jason Brown for CASSANDRA-6847
Merge branch 'cassandra-1.2' into cassandra-2.0