HSHA rethrows OOM
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6255
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Paginate batchlog replay

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6569
Merge branch 'cassandra-1.2' into cassandra-2.0

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

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
Add example jmx auth file location
Patch by Peter Halliday, reviewed by brandonwilliams for CASSANDRA-6286
skip blocking on streaming during drain
patch by jasobrown; reviewed by yukim for CASSANDRA-6603
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
By default cassandra will no longer start without jna
patch by clardeur reviewed by dbrosius for cassandra 6575
Ninja-add COUNTER_MUTATION to DROPPABLE_VERBS
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Improve error message when loaded sstable doesn't match schema

patch by slebresne; reviewed by driftx for CASSANDRA-6262
Merge branch 'cassandra-1.2' of http://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk