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
Accept dollar-quoted strings in CQL

Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-7769
Adding new Compaction Strategy

- Based off LeveledCompaction, but allows for levels to be overlapping
  at a level higher than 0
- When an overlapping compaction has occurred, and no other compactions
  are necessary, OCS will work on de-overlapping the levels
- A new tool has been added to nodetool, 'getmanifest', which allows for
  the inspection of where in the levels the SSTables currently are
Make LCS act the same when MOLO=0