Mark CF clean if a mutation raced the drop and got it marked dirty
patch by jbellis; reviewed by Tyler Hobbs for CASSANDRA-5946
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Fix nodetool status regression
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Remove new asserts in CMFD
Patch by Sam Tunnicliffe, reviewed by brandonwilliams for CASSANDRA-6208
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
implementing CL.LOCAL_ONE
Merge branch '6202' into 6202_2.0
apply local_one changes to 2.0
fix broken merge
Merge branch 'cassandra-2.0' into trunk
more merge breakage
Merge branch 'cassandra-2.0' into trunk
Implement cleanupOnSuccess for pig 0.11
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6213
implementing CL.LOCAL_ONE
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch '6202_2.0' into cassandra-2.0