fix typo in cfmbean comparator
Merge branch 'cassandra-1.2' into cassandra-2.0
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix CQL doc
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix saving triggers to schema

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6789
Fix trigger mutations when base mutation list is immutable

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6790
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
Fix accounting in FileCacheService to allow re-using RAR
Patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6838
Fix static counter columns

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6827
Restore expiring->deleted (cell) compaction optimization

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6844
fixed bug in CompactionManager.needsCleanup

Patch by Dmitrij Koniajev, reviewed by marcuse for CASSANDRA-6845.
Correctly compare BooleanType values other than 0 and 1

Patch by Sylvain Lebresne, reviewed by Tyler Hobbs for CASSANDRA-6779
add #2635 to CHANGES
Merge branch 'cassandra-1.2' into cassandra-2.0
fix nodetool getsstables for blob PK
patch by Nate McCall; reviewed by jbellis for CASSANDRA-6803
merge from 1.2
Fix leaking validator FH in StreamWriter
patch by Joshua McKenzie; reviewed by jbellis for CASSANDRA-6832