remove seed from stress profile. cleanup yamls. ninja
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Make default stress batches logged
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix truncate to always call flush on table

Patch by Jeremiah Jordan; reviewed by tjake for (CASSANDRA-7511)
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java
	src/java/org/apache/cassandra/db/DataTracker.java
	test/unit/org/apache/cassandra/db/CommitLogTest.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix min/max cell name collection with 2.0 range tombstones

Patch by Tyler Hobbs; review by Marcus Eriksson for CASSANDRA-7593
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
SSP doesn't cache seeds forever

Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-7663
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Don't use strict consistency when replacing

Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7568
Merge branch 'cassandra-2.1.0' into cassandra-2.1