revert #5966
Fix CQL doc imprecision
Avoid second-guessing out-of-space state
patch by jbellis; reviewed by yukim for CASSANDRA-5605
merge from 1.2
merge from 2.0
Fix memory leak in snapshot repair

patch by yukim; reviewed by jbellis for CASSANDRA-6047
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
	src/java/org/apache/cassandra/io/sstable/SSTableReader.java
Merge branch 'cassandra-2.0' into trunk