fix potential for multiple concurrent compactions of the same sstables
patch by jbellis and yukim; reviewed by slebresne for CASSANDRA-5256
Merge branch 'cassandra-1.2' into trunk
Fix CQL3 composite partition key error

patch by slebresne; reviewed by jbellis for CASSANDRA-5240
Allow IN clause for last clustering key

patch by slebresne; reviewed by jbellis for CASSANDRA-5230
Merge branch 'cassandra-1.2' into trunk
Add cqlsh help for auth statement

patch by iamaleksey; reviewed by slebresne for CASSANDRA-5233
Update debian version for 1.2.2 release
Fix pessimistic unit tests post-4671

Conflicts:
	test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java
Change order of directory searching for c*.in.sh

patch by Benjamin Coverston; reviewed by Ben Gamble for CASSANDRA-3983
Add nodetool options to repair specific ranges.
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-5280
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageService.java
	src/java/org/apache/cassandra/tools/NodeCmd.java
	src/java/org/apache/cassandra/tools/NodeProbe.java
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	CHANGES.txt
Ninja-fix a typo in DropUserStatement
Merge branch 'cassandra-1.2' into trunk
ocd
Merge branch 'cassandra-1.1' into cassandra-1.2
Merge branch 'cassandra-1.2' into trunk
assert cleanup
reformat gms package