fix tracing adding 2x activity instead of threadName
Merge branch 'cassandra-2.0' into trunk
Make LOCAL_ONE the default CL for hadoop
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6214
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix 2.0.2 changes pending re-roll
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt