Ninja: typo in cqlsh
Merge branch 'cassandra-2.0' into cassandra-2.1
RepairTask didn't send a correct message on IllegalArgumentException

patch by Mikhail Stepura; reviewed by Yuki Morishita for CASSANDRA-7336
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Add optional keyspace to DROP INDEX statement

Patch by Andrés de la Peña; review by Tyler Hobbs for CASSANDRA-7314
Add per-CF range read request latency metrics

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-7338
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
cleanup
Merge branch 'cassandra-2.0' into cassandra-2.1
close segments in resetUnsafe
patch by Ala' Alkhaldi; reviewed by Joshua McKenzie for CASSANDRA-7334
Reduce run time for CQL tests

patch by slebresne; reviewed by thobbs for CASSANDRA-7327
Fix heap size calculation on Windows
patch by Josh McKenzie; reviewed by Philip Thompson for CASSANDRA-7352
RefCount native frames from netty to avoid corruption bugs

patch by tjake; reviewed by bes for CASSANDRA-7245
Use $CASSANDRA_HOME for default paths instead of /var

Patch by Tyler Hobbs; reviewed by Brandon Williams and Joshua McKenzie
for CASSANDRA-7136
Fix rare potential NPE in HHOM page size calculation

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

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

Conflicts:
	CHANGES.txt
Fix CASSANDRA-7354 CHANGES.txt entry
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt