typos
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.0
typos
Fix compaction race during columnfamily drop
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5957
merge from 1.2
Merge branch 'cassandra-2.0' into trunk