Add iterable CqlPagingRecordReader.
Patch by Luca Rosellini, reviewed by brandonwilliams for CASSANDRA-6497
Fix preparing statement with batch and delete from collection

patch by Jan Chochol; reviewed by slebresne for CASSANDRA-6607
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
Merge branch 'cassandra-2.0' into trunk
clarify yaml comment about commitlog_periodic_queue_size
New counters implementation

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6504
Reduce garbage generated by bloom filter lookups
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6609
Merge branch 'cassandra-2.0' into trunk
update nodetool help for truncatehints
Require 2.0.5 for rolling upgrades
Revert "By default cassandra will no longer start without jna"

This reverts commit 68baaedd6f0adf4719f0c65296433d5f006c74c4.

Conflicts:
	CHANGES.txt
Fix NPE when streaming connection is not yet ready

patch by yukim; reviewed by Russell Spitzer for CASSANDRA-6210
Merge branch 'cassandra-2.0' into trunk
get ocd on log capitalization
bundle jna 4.0
patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5872
Remove the assert from DataTracker.unsubscribe()
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Avoid rare duplicate read repair triggering

patch by Yang Wei; reviewed by Aleksey Yeschenko for CASSANDRA-6606
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/ReadCallback.java