Fix typo in DeletionInfo
Update versions and NEWS for 1.2.16 release
Remove user types rename for now
Rewrite, and always call, ABSC#localCopy
Fix potential NPE
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Fix BB relative get
Merge branch 'cassandra-2.0' into cassandra-2.1
Add optimized CF.hasColumns() implementations

patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-6941
Ninja: don't close the connection you don't own (after SOURCE command)
make cache serializer inner classes static
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