Fix cache persistence when both row and key cache are enabled
patch by Mikhail Stepura and jbellis for CASSANDRA-6413
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Pig: fix duplicate schema alias
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6309
Merge branch 'cassandra-2.0' into trunk
warn about sync delays every 5s instead of as-it-happens
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-3578
add describe_local_ring for Hadoop's benefit
patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-6268
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk
Don't resubmit counter mutation runnables internally

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6427
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Index相关
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk