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
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	bin/cqlsh
Merge branch 'cassandra-2.1' into trunk
Backport CASSANDRA-6747

patch by yukim; reviewed by krummas for CASSANDRA-7560
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Remove shuffle/taketoken.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7601
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Remove shuffle/taketoken

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7601
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	bin/cqlsh
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/service/PendingRangeCalculatorService.java
	src/java/org/apache/cassandra/service/ScheduledRangeTransferExecutorService.java
	test/unit/org/apache/cassandra/service/RelocateTest.java
Improve cqlsh waiting for a trace to complete

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-7626
Fix tracing of concurrent range slices

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