fix CHANGES
Merge branch 'cassandra-1.2' into cassandra-2.0
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Enable tcp keepalive on incoming connections.

Patch by marcuse, reviewed by jbellis for CASSANDRA-4053
Merge branch 'cassandra-2.0' into trunk
add snapshot repair to NodeToolHelp.yaml
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Send correct metadata on SELECT COUNT

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6080
Merge branch 'cassandra-2.0' into trunk
Track clients' remote addresses in ClientState

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6070
Merge branch 'cassandra-2.0' into trunk
Avoid sending Truncate command to fat clients
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6088
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Print a warning when using nodetool ring with vnodes.
Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-5954
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk
Start MeteredFlusher earlier to prevent OOM during CL replay
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-7078