Check that key_aliases/column_aliases exists before using them
Patch by brandonwilliams, reviewed by iamaleksey for CASSANDRA-6589
fix indentation
HSHA rethrows OOM
Patch by Mikhail Stepura, reviewed by brandonwilliams for CASSANDRA-6255
Merge branch 'cassandra-1.2' into cassandra-2.0
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
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
Ninja-add COUNTER_MUTATION to DROPPABLE_VERBS
Merge branch 'cassandra-1.2' into cassandra-2.0
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
Add properties to adjust FD initial value and max interval
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-4375
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/gms/FailureDetector.java
fix yaml comment for 6059
ocd
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt