Improve initial FD phi estimate when starting up
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6385
merge from 1.2
convert sum to double before dividing
make inner class static
Support NaN and Infinity as float constants

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6003
Don't allow describe on CQL3 table in CLI ever

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5750
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Update version for 2.0.3 release
remove RF from nodetool ring output
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6289
fix attempting to flush empty rows
patch by jbellis; reviewed by jasobrown for CASSANDRA-6374
Fix potential out of bounds exception during paging

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6333
Remove the vestiges of PBSPredictor from nodetool help
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
Change removetoken refs to removenode
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix setting last compacted key in the wrong level for LCS
patch by Jiri Horky; reviewed by jbellis for CASSANDRA-6284
Fix divide-by-zero in PCI
patch by jbellis for CASSANDRA-6403
Fix the trigger example
Add sub-ms precision formats to the timestamp parser

patch by Lorcan Coyle; reviewed by Aleksey Yeschenko for CASSANDRA-6395