updated for 1.1.11 release
fix corrupt changelog
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
Use allocator information to improve memtable memory usage estimate
patch by jbellis; reviewed by jasobrown for CASSANDRA-5497
remove unused compaction controller field from Unwrapper iterator
Merge branch 'cassandra-1.2' into trunk
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	build.xml
	debian/changelog
	src/java/org/apache/cassandra/net/OutboundTcpConnection.java
Merge branch 'cassandra-1.2' into trunk
merge from 1.1
Merge branch 'cassandra-1.2' into trunk
Always record row-level tombstones in index component
patch by jbellis; reviewed by jasobrown for CASSANDRA-5487
Revert "Always record row-level tombstones in index component"

This reverts commit 798470e051af794b605cce28031b33b589cfc6d8.
Always record row-level tombstones in index component; this time from the correct feature branch
patch by jbellis; reviewed by jasobrown for CASSANDRA-5487