Fix typo in DeletionInfo
Update versions and NEWS for 1.2.16 release
Track liveRatio per-memtable, not per-CF

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6945
Post-CASSANDRA-6945 tweak
2.0 compatibility modifications for CASSANDRA-6931

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6931
Add missing entry in protocol spec (#6954)
Fix batchlogManager#deleteBatch() use of millisecond timsestamps

patch by Aleksey Yeschenko; reviewed by Pavel Yaskevich for
CASSANDRA-6822
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	NEWS.txt
	build.xml
	debian/changelog
	src/java/org/apache/cassandra/db/BatchlogManager.java
	src/java/org/apache/cassandra/db/DeletionInfo.java
Make sure we keep the sstable level when running upgradesstables.

Patch by marcuse; reviewed by yukim for CASSANDRA-6958
Fix LIMIT with static columns

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6956
Fix 6956 patch
Clearer message for assertion error
Don't break API in minor rev, followup to CASSANDRA-6958
Fix prepared statement on thrift post-6659
Fix Cassandra 2.0.x validates Thrift columns incorrectly

patch by thobbs and slebresne; reviewed by thobbs and slebresne for CASSANDRA-6892
Fix error with super columns in mixed 1.2-2.0 cluster

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6966
Fix bad skip of sstables on slice query with composite start/finish

Patch by Tyler Hobbs; reviewed by Sylvain Lebresne for CASSANDRA-6825
Fix unintended update with conditional statement

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6893
Replace equals by type compare
Don't shut ExpiringMap down.

Patch by Benedict, reviewed by brandonwilliams for CASSANDRA-6948