rename SSTR.markCompacted -> markObsolete to disambiguate with the compacting status in DataTracker
finish s/markCompacted/markObsolete/
comment
comments
updated for 1.1.11 release
replace measureDeep in key cache with custom calculation
patch by Vijay; reviewed by Jonathan Ellis for CASSANDRA-4860
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamily.java
	src/java/org/apache/cassandra/db/RowIndexEntry.java
Reenable ALTER TABLE DROP with new semantics

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-3919
fix corrupt changelog
Add missing CHANGES.txt entry for 3919
Fix SemanticVersion.isSupportedBy minor/patch handling

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5496
Merge branch 'cassandra-1.2' into trunk
Do not hard code the current Descriptor version into BootstrapTest.
patch by jasobrown; reviewed by Aleksey Yeschenko for CASSANDRA-5495
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/sstable/Descriptor.java
	test/unit/org/apache/cassandra/streaming/BootstrapTest.java
Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
add 5393 to CHANGES.txt
Add retry mechanism to OTC for non-droppable_verbs
patch by jasobrown; reviewed by jbellis for CASSANDRA-5393
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/net/OutboundTcpConnection.java
replace {list}.iterator().next() with {list}.get(0)
Merge branch 'cassandra-1.2' into trunk