fix MoveTest
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
CHANGES
simplify
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
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
Merge branch 'trunk' into work