cleanup
merge from 2.1
Merge branch 'cassandra-2.1' into trunk
Update system.peers correctly when relocating tokens.

Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7126
Merge branch 'cassandra-1.2' into cassandra-2.0

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

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
fix build
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
switch to using jamm with groupId com.github.jbellis, as this one is published for 0.2.6
Merge branch 'cassandra-2.1' into trunk
minor javadoc fixes
Merge branch 'cassandra-2.1' into trunk
fix logback version string typo: 1.1.12 s/b 1.1.2
Merge branch 'cassandra-2.1' into trunk
netty >= version 4.0 now has an artifact name of netty-all
Merge branch 'cassandra-2.1' into trunk
add license for commons-math3.3.2