Fix typo in DeletionInfo
Update versions and NEWS for 1.2.16 release
Remove user types rename for now
Merge branch 'cassandra-2.1' into trunk
Rewrite, and always call, ABSC#localCopy
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
	src/java/org/apache/cassandra/db/Memtable.java
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
Merge branch 'cassandra-2.1' into trunk
Add optimized CF.hasColumns() implementations

patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-6941
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java
Ninja: don't close the connection you don't own (after SOURCE command)
Merge branch 'cassandra-2.1' into trunk
make cache serializer inner classes static
Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.1' into trunk