fix nativeMaxSimultReqs
Merge branch 'cassandra-2.1' into trunk
Don't swap max/min column names when mutating sstable metadata.

Patch by marcuse; reviewed by benedict for CASSANDRA-7596.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Switch liveRatio-related log messages to DEBUG

ninja-patch by Aleksey Yeschenko for CASSANDRA-7467
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/Memtable.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Revert "Fail to start if commit log replay encounters an exception"

This reverts commit 581ce631026b98ee9438d54ef144df89bc91100b.
merge from 2.1
typo
Handle KeyboardInterrupt properly in cqlsh

Patch by Jordon Pittier, reviewed by brandonwilliams for CASSANDRA-5481
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
fix broken merge
Merge branch 'cassandra-2.1' into trunk
Handle paged results in cqlsh

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7625