fix merge
Merge branch 'cassandra-2.0' into trunk
fix merge
really fix build this time
Merge branch 'cassandra-2.0' into trunk
Add more pig unit tests for type mappings.
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6197
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
match internal only filename to internal directory version
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
cosmetics
Remove dead node from system.peers when replacing.
Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Remove dead node from system.peers when replacing.
Patch by brandonwilliams, reviewed by Jeremiah Jordan for CASSANDRA-6217
fix merge again
Merge branch 'cassandra-2.0' into trunk
millis->nanos
Merge branch 'cassandra-2.0' into trunk