Expose bulk loading progress over JMX
patch by Tyler Hobbs; reviewed by Nick Bailey for CASSANDRA-4757
Merge branch 'cassandra-2.0' into trunk
Improve nodetool cfhistograms formatting
patch by Tyler Hobbs; reviewed by Benedict Elliott Smith for CASSANDRA-6360
Merge branch 'cassandra-2.0' into trunk
Fix upgradesstables NPE for non-CF-based indexes
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6645
merge from 2.0
Fix upgradesstables NPE for non-CF-based indexes
patch by Sergio Bossa; reviewed by jbellis for CASSANDRA-6645
merge from 1.2
merge from 2.0
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
merge
Update CHANGES for CASSANDRA-6522
Merge branch 'cassandra-2.0' into trunk
Update CHANGES after CASSANDRA-5357
nope 6522 was not merged from 1.2
Merge branch 'cassandra-2.0' into trunk
CHANGES
Add nodetool taketoken to relocate vnodes.
Patch by brandonwilliams reviewed by jbellis for CASSANDRA-4445
Merge branch 'cassandra-2.0' into trunk
Add nodetool taketoken to relocate vnodes.
Patch by brandonwilliams reviewed by jbellis for CASSANDRA-4445