use junit assertions over assert
nodetool no longer shows node joining (Also fix nodetool status)
patch by Vijay; reviewed by driftx for CASSANDRA-6811
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
Merge branch 'cassandra-2.1' into trunk
Fix accounting in FileCacheService to allow re-using RAR
Patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6838
merge from 2.0
Merge branch 'cassandra-2.1' into trunk
Fix static counter columns

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6827
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Merge branch 'cassandra-2.1' into trunk
Update syntax for changing caching options.

Patch by marcuse, reviewed by slebresne for CASSANDRA-6745.
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql/AlterTableStatement.java
	src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
Switch CRC component to Adler and include it for compressed sstables
patch by Marcus Eriksson, Radovan Zvoncek, and jbellis for CASSANDRA-4165
Merge remote-tracking branch 'origin/trunk' into trunk
Merge branch 'cassandra-2.1' into trunk
add ChecksummedSequentialWriter
Merge branch 'cassandra-2.1' into trunk
Restore expiring->deleted (cell) compaction optimization

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6844
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt