public ip
Merge branch 'master' of https://github.com/yigh/PatchedDistro

Conflicts:
	apache-cassandra-2.0.6/conf/cassandra.yaml