RowIndexEntry.Serializer.skip is a static method, call it as such
Fix ClassCastException for super columns
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk
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
commit log注释
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra 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
compaction注释
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk

Conflicts:
	src/java/org/apache/cassandra/cache/AutoSavingCache.java
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
	src/java/org/apache/cassandra/config/KSMetaData.java
	src/java/org/apache/cassandra/cql3/CQL3Type.java
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
	src/java/org/apache/cassandra/cql3/statements/AlterTypeStatement.java
	src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/DefsTables.java
	src/java/org/apache/cassandra/db/Directories.java
	src/java/org/apache/cassandra/service/CassandraDaemon.java
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
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ConsistencyLevel.java
1.2 nodes show 2.0 nodes as up when upgrading.
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-6554