Fix typo in DeletionInfo
Update versions and NEWS for 1.2.16 release
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
Merge branch 'cassandra-2.1' into trunk
Make sure we keep the sstable level when running upgradesstables.

Patch by marcuse; reviewed by yukim for CASSANDRA-6958
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Fix LIMIT with static columns

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6956
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/filter/ColumnCounter.java
Fix 6956 patch
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/filter/ColumnCounter.java
Merge branch 'cassandra-2.1' into trunk
Clearer message for assertion error
Don't break API in minor rev, followup to CASSANDRA-6958
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
Merge branch 'cassandra-2.1' into trunk