Upgrade netty to 4.0.20
Merge branch 'cassandra-2.1' into trunk
Don't insert tombstones that hide indexed values into 2i

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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java
Merge branch 'cassandra-2.1' into trunk
Handle empty CFs in Memtable#maybeUpdateLiveRatio()

patch by Christian Spriegel; reviewed by Aleksey Yeschenko for
CASSANDRA-7401
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/Memtable.java
Merge branch 'cassandra-2.1' into trunk
Increase socket bind backlog to 500
Patch by Oleg Anastasyev, reviewed by brandonwilliams for CASSANDRA-7236
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
fix heap size on Windows 32bit VM
patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353
Merge branch 'cassandra-2.1' into trunk
add file:/// on Windows to -Dcassandra.config value
patch by Marco Tulio Avila Cerón; reviewed by Lyuben Todorov for CASSANDRA-7398
Merge branch 'cassandra-2.1' into trunk
Clean up gossiper fully after shadow round.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Clean up gossiper fully after shadow round.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318
Clean up gossiper fully after shadow round.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318