Avoid sending Truncate command to fat clients
patch by Oleg Anastasyev; reviewed by jbellis for CASSANDRA-6088
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