merge #7063 from 1.2
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix handling of empty counter replication mutations

patch by Aleksey Yeschenko; reviewed by Richard Low for CASSANDRA-7144
CASSANDRA-7144 follow-up
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageProxy.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/CounterMutation.java
	src/java/org/apache/cassandra/service/StorageProxy.java
Merge branch 'cassandra-2.1' into trunk
Ninja: typo in cqlsh
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.1' into trunk
Add optional keyspace to DROP INDEX statement

Patch by Andrés de la Peña; review by Tyler Hobbs for CASSANDRA-7314
Merge branch 'cassandra-2.1' into trunk
imports cleanup
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