Set SO_LINGER to 0 for netty
Merge branch 'cassandra-2.1' into trunk
improve concurrency of repair process

patch by yukim; reviewed by krummas for CASSANDRA-6455
Fix counters in supercolumns during live upgrades from 1.2

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7188
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/CounterUpdateColumn.java
Merge branch 'cassandra-2.1' into trunk
Fix merging schemas with re-dropped keyspaces

patch by Aleksey Yeschenko; reviewed by Pavel Yaskevich for
CASSANDRA-7256
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/DefsTables.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/DefsTables.java
Merge remote-tracking branch 'origin/trunk' into 7692-3.0