Allow nodetool to optionally resolve hostnames.
Patch by Daneel S. Yaitskov, reviewed by brandonwilliams for
CASSANDRA-2238
Merge branch 'cassandra-1.2' into cassandra-2.0
Allow nodetool to optionally resolve hostnames.
Patch by Daneel S. Yaitskov, reviewed by brandonwilliams for
CASSANDRA-2238
Merge branch 'cassandra-2.0' into trunk
Delete unfinished compaction sstables incrementally

patch by thobbs; reviewed by yukim for CASSANDRA-6086
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/service/CassandraDaemon.java
	test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk
don't declare throwing exs that aren't thrown
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk
cql3注释