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
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/DataTracker.java
	src/java/org/apache/cassandra/db/Memtable.java
Ninja-in OperationType.COUNTER_CACHE_SAVE
Post-CASSANDRA-6945 tweak
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/Memtable.java
snaptree is no longer a dependency in 2.1 and forwards
2.0 compatibility modifications for CASSANDRA-6931

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6931
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
Serialize batchlog mutations with the version of the target node

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6931
Add missing CHANGES.txt entry for CASSANDRA-6931
Optimize CounterColumn#reconcile()

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6953
Remove 1.2 sstable support in 2.1

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6869
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1

Conflicts:
	CHANGES.txt
	NEWS.txt
Add missing entry in protocol spec (#6954)
Merge branch 'cassandra-2.0' into cassandra-2.1
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
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java