Ninja-unify 1.1/1.2/2.0 system tests
Ninja-unify 1.1/1.2/2.0 system tests
Ninja-fix 1.2 system tests
Update thrift-generated Constants.java
Fix repair hanging silently on an unexpected error

patch by yukim; reviewed by slebresne for CASSANDRA-5229
Fix Ec2Snitch regression introduced by CASSANDRA-5171

patch by vijay2win; reviewed by driftx and arya for CASSANDRA-5432
cqlsh: ninja-kill 'Perhaps you meant to use CQL X' warning
whitespace
fix 2i updates with indentical values and timestamps
patch by Sam Tunnicliffe; reviewed by jbellis for CASSANDRA-5540
enable native protocol by default
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
avoid NPE on describe cf with no compaction strategy (local)
Fix intersection with Bound computation

patch by wy96f; reviewed by slebresne for CASSANDRA-5551
Backport #5551 to 1.1
Merge branch 'cassandra-1.1' into cassandra-1.2
Fix changelog
5314: Decrease batch replay interval to 1 minute
5314: Switch BatchlogManager internals to CQL
5314: Handle hint ttls properly