re-enable assertions by default
reorder imports
Add ability to throttle batchlog replay

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6550
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/BatchlogManager.java
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/BatchlogManager.java
RowIndexEntry.Serializer.skip is a static method, call it as such
Fix ClassCastException for super columns
Verify that the keyspace exists in describeRing and print nicer error message in BulkLoader.

Patch by marcuse, reviewed by thobbs for CASSANDRA-6529
Merge branch 'cassandra-2.0' into trunk
Allow specifying custom secondary index options in CQL3

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

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
CF id is now non-deterministic

and data dir/key cache are also unique per CF id.
patch by yukim; reviewed by Pavel Yaskevich for CASSANDRA-5202
Make user types keyspace scoped

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6438
Secondary indexing of map keys

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6383
Fix execution of LOCAL_QUORUM queries with SimpleStrategy

patch by alexliu68; reviewed by slebresne for CASSANDRA-6545
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/ConsistencyLevel.java
Wait for gossip to settle before accepting client connections
patch by Chris Burroughs; reviewed by Tyler Hobbs and jbellis for CASSANDRA-4288
merge from 2.0
1.2 nodes show 2.0 nodes as up when upgrading.
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-6554
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/gms/Gossiper.java