use %n for new line in printf
Update versioning for 2.0.4 release
fix typo
warnings
comment
merge from 2.0
fsync compression metadata
patch by jbellis; reviewed by Pavel Yaskevich for CASSANDRA-6531
merge from 1.2
merge from 2.0
shutdown() the compaction strategy in CFS.invalidate()
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
Merge branch 'cassandra-2.0' into trunk
warnings
make CM.Writer.close idempotent
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
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