Don't use _ as a reference
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/cassandra into trunk
remove unneeded override
Allow pid file to be read by mere mortals.

Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7851
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix yaml snitch reconnect trick

Patch by Holger Bornträger, reviewed by brandonwilliams for CASSANDRA-7912
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
deprecate yaml snitch
Merge branch 'cassandra-2.1' into trunk
kill yaml snitch