Make sure compaction throughput values doesn't overflow because of int math
patch by pvai reviewed by dbrosius for cassandra-6647
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
get ocd on log capitalization
Merge branch 'cassandra-2.0' into trunk
Update news, version in preparation for 1.2.15
Update changes and news file for 2.0.5 re-roll
Remove/update invalid sentences in CQL doc
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
Fix partition and range deletes not triggering flush

patch by benedict; reviewed by slebresne for CASSANDRA-6655
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
	src/java/org/apache/cassandra/db/DeletionInfo.java
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
	src/java/org/apache/cassandra/db/Memtable.java
Replace UnsortedColumns usage with ArrayBackedSortedColumns

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6630
update stream-lib for HLL++ serialization thread-safety
naming
Actually remove UnsortedColumns (CASSANDRA-6630 followup)
Correctly handle null in conditions with TTL

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6623
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/service/StorageProxy.java
Account for range and row tombstones in tombstone drop time histogram.

Patch by marcuse, reviewed by jbellis for CASSANDRA-6522