Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
remove dead fields
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
merge from 2.0
Merge branch 'cassandra-2.0' into trunk
add back shouldPurge check before counter merging
Merge remote-tracking branch 'origin/trunk' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Pig: fix duplicate schema error
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6309
Merge branch 'cassandra-2.0' into trunk
rm dead code
SSTable metadata(Stats.db) format change

patch by yukim; reviewed by thobbs for CASSANDRA-6356
merge from 2.0