fix typo
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Ninja fix debian rules to handle versions with -N package convention
Merge branch 'cassandra-2.1' into trunk
CrcCheckChance should adjust based on live CFMetadata not sstable metadata

patch by tjake; reviewed by Jason Brown for CASSANDRA-7978
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Adds test for CASSANDRA-7978
Merge branch 'cassandra-2.1' into trunk