Merge branch 'cassandra-2.1' into trunk
Add Google Compute Engine snitch

Patch by Brian Lynch, reviewed by brandonwilliams for CASSANDRA-7132
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
use %n for newline in format
Merge branch 'cassandra-2.1' into trunk
make RestorableEWMA a static inner class
Fix writetime/ttl methods for static columns

patch by slebresne; reviewed by thobbs for CASSANDRA-7081
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ColumnGroupMap.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Merge branch 'cassandra-2.1' into trunk
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