Merge branch 'cassandra-1.2' into trunk
make auth config a bit friendlier
merge from 1.2
Allow GPFS to reconnect to the internal IP.
Patch by Chris Burroughs, reviewed by brandonwilliams for CASSANDRA-5630
Merge branch 'cassandra-1.2' into trunk
Allow GPFS to reconnect to the internal IP.
Patch by Chris Burroughs, reviewed by brandonwilliams for CASSANDRA-5630
Remove nonexistent drop column from cqlsh help
Merge branch 'cassandra-1.2' into trunk
Revert "Remove nonexistent drop column from cqlsh help"

This reverts commit 473713f461524c10b5f403ac84d821e26aec6df2.
cqlsh: Add row count to SELECT output

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5636
fix help text for --tspw option of cassandra-cli
patch by hmetske reviewed by dbrosius for CASSANDRA-5643
Merge branch 'cassandra-1.2' into trunk
retain initial cause exceptions for internode encryption issues in MessagingService
patch by hmetske reviewed by dbrosius for CASSANDRA-5644
Merge branch 'cassandra-1.2' into trunk
fix error message spelling with cql select statements
patch by rvieira reviewed by dbrosius for cassandra-5647
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
imports cleanup
patch by Vijay; reviewed by Aleksey Yeschenko for CASSANDRA-5576
update CqlRecordWriter interface
patch by Alex Liu and jbellis for CASSANDRA-5622