Don't search jdk6-specific paths in debian init
Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6396
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
allocate fixed index summary memory pool and resample cold index summaries to use less memory
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5519
Change removetoken refs to removenode
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Fix setting last compacted key in the wrong level for LCS
patch by Jiri Horky; reviewed by jbellis for CASSANDRA-6284
merge from 2.0
move setting lastCompactedKey to before the return-if-nothing-added
Fix divide-by-zero in PCI
patch by jbellis for CASSANDRA-6403
Merge branch 'cassandra-2.0' into trunk
Fix the trigger example
Merge branch 'cassandra-2.0' into trunk
Add sub-ms precision formats to the timestamp parser

patch by Lorcan Coyle; reviewed by Aleksey Yeschenko for CASSANDRA-6395
Merge branch 'cassandra-2.0' into trunk
cqlsh: quote single quotes in strings inside collections

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6172
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk
Ninja-fix CQL3 doc