update measure to measureDeep
patch by vijay reviewed by jbellis for CASSANDRA-4860
Add schema_version to local table (since local node is not in peers)
fix 'help describe cluster' in cassandra-cli
Merge branch 'cassandra-1.0' into cassandra-1.1
add memtable_flush_period_in_ms
patch by yukim; reviewed by jbellis for CASSANDRA-4237
Skip repair on system_trace and keyspaces with RF=1; patch by yukim reviewed by Sylvain Lebresne for CASSANDRA-4956
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Check gossiper's HOST_ID during hinted handoff.
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-4384
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Remove ALTER TABLE DROP until #3919 is resolved
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Fix endless loop/compaction of schema_* CFs due to broken timestamps
patch by Pavel Yaskevich; reviewed by Brandon Williams for CASSANDRA-4880
Set max frame size to 15MB in the cli to avoid OOM.
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-4969
Merge branch 'cassandra-1.2.0' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
Merge
merge from 1.1