add .gitignore
patch by Michael Shuler; reviewed by jbellis for CASSANDRA-4899
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix streaming older SSTable yields row tombstones

patch by yukim; reviewed by jbellis for CASSANDRA-6527
Update versioning for 2.0.4 release
comment
fsync compression metadata
patch by jbellis; reviewed by Pavel Yaskevich for CASSANDRA-6531
merge from 1.2
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
make CM.Writer.close idempotent
Merge branch 'cassandra-1.2' into cassandra-2.0
Allow truncating hints from nodetool.
Patch by Sankalp Kohli, reviewed by brandonwilliams for CASSANDRA-6158
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
Delete unfinished compaction sstables incrementally

patch by thobbs; reviewed by yukim for CASSANDRA-6086
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