Ninja-unify 1.1/1.2/2.0 system tests
Single-pass compaction
patch by jbellis; reviewed by marcuse for CASSANDRA-4180
tweak assert to match what it says it does
use waitOnFuture more often
presize collection
whitespace
r/m redundant log line on startup
MemoryMeter is no longer used by CacheService
Merge branch 'cassandra-1.2' into trunk
fix 2i updates with indentical values and timestamps
patch by Sam Tunnicliffe; reviewed by jbellis for CASSANDRA-5540
merge from 1.2
use ImmutableSet instead of unmodifiableSet
enable native protocol by default
Merge branch 'cassandra-1.2' into trunk
add 3997 to CHANGES
Move CassandraServerTest.test_get_count() to thrift server tests
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	test/unit/org/apache/cassandra/service/CassandraServerTest.java
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	test/unit/org/apache/cassandra/service/CassandraServerTest.java
avoid NPE on describe cf with no compaction strategy (local)
Merge branch 'cassandra-1.2' into trunk