Ninja-add COUNTER_MUTATION to DROPPABLE_VERBS
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Improve error message when loaded sstable doesn't match schema

patch by slebresne; reviewed by driftx for CASSANDRA-6262
Merge branch 'cassandra-1.2' of http://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk
remove useless equals
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk
add listsnapshots command to nodetool
patch by Sankalp Kohli and Lyuben Todorov for CASSANDRA-5742
add SnapshotDetailsTabularData.java
Add properties to adjust FD initial value and max interval
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-4375
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/gms/FailureDetector.java
Merge branch 'cassandra-2.0' into trunk
fix yaml comment for 6059
Merge branch 'cassandra-2.0' into trunk
ocd
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt
Merge branch 'cassandra-2.0' into trunk