Allow truncating hints from nodetool.
Patch by Sankalp Kohli, reviewed by brandonwilliams for CASSANDRA-6158
Merge branch 'cassandra-2.0' into trunk
fix test build
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
don't declare throwing exs that aren't thrown
Validate CF existence on execution for prepared statement

patch by aholmber; reviewed by slebresne for CASSANDRA-6535
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/ClientState.java
Merge branch 'cassandra-2.0' into trunk
Use Atomic*FieldUpdater to save memory.

Patch by marcuse, reviewed by belliottsmith for CASSANDRA-6281.
make it clear that varargs in are in effect
merge