remove incorrect use of generics in non-generified method call
Merge branch 'cassandra-2.0' into cassandra-2.1
make NoOp's constructor private as it's a singleton
Fix infinite loop on exception while streaming

Patch by JoshuaMcKenzie; reviewed by marcuse for CASSANDRA-7330
Merge branch 'cassandra-2.0' into cassandra-2.1
Make sure we clear out repair sessions from netstats

Patch by JoshuaMcKenzie; reviewed by marcuse for CASSANDRA-7329
Don't fail streams on failure detector downs

Patch by JoshuaMcKenzie; reviewed by marcuse for CASSANDRA-3569
Add missing file
merge #7063 from 1.2
Merge branch 'cassandra-2.0' into cassandra-2.1
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
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