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

patch by yukim; reviewed by jbellis for CASSANDRA-6527
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
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