Remove the assert from DataTracker.unsubscribe()
Merge branch 'cassandra-1.2' into cassandra-2.0
Avoid rare duplicate read repair triggering

patch by Yang Wei; reviewed by Aleksey Yeschenko for CASSANDRA-6606
Fix ABSC reverse iterator's remove() method

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6629
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix paging discardFirst IllgalArgumentException

patch by slebresne; reviewed by thobbs for CASSANDRA-6555
Backport 6190
Merge branch 'cassandra-1.2' into cassandra-2.0
add cassandra.default_messaging_version
patch by Minh Do; reviewed by jbellis for CASSANDRA-6619
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix ArrayIndexOutOfBoundsException in 2ndary index query

patch by slebresne; reviewed by lyubent for CASSANDRA-6470
Release sstables upon rebuilding 2i

patch by Sergio Bossa; reviewed by Aleksey Yeschenko for
CASSANDRA-6635
Add AbstractCompactionStrategy.startup() method

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6637
Move LCS DataTracker subscription to startup()
Handle host id conflicts properly.
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-6615
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
revert CASSANDRA-6107, and cut max cached statements to 50k
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix SSTableScanner potentially skipping rows during cleanup

patch by slebresne; reviewed by thobbs for CASSANDRA-6638
sstables from stalled repair sessions become live after a reboot and can resurrect deleted data
patch by jasobrown, reviewed by yukim for CASSANDRA-6503