Fixup for 6271
Remove dead code

patch by slebresne; reviewed by jbellis for CASSANDRA-6580
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
Fix previous merge
Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6495
Merge branch 'cassandra-2.0' into trunk
Remove time penalty from DES.
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6465
Merge branch 'cassandra-2.0' into trunk
Don't shutdown a nonexistant native server on 1.2, either.
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
make 2i CFMetaData have parent's CF ID
Don't scrub 2i CF if index type is CUSTOM
Fix user defined compaction
Fix serialization test
Create system_auth tables with fixed CFID
Add LOCAL_SERIAL to ThriftConversion
Patch by brandonwilliams for CASSANDRA-6584
Merge branch 'cassandra-2.0' into trunk
update changes
Merge branch 'cassandra-2.0' into trunk