Fix CommitLogReplayer date time issue
patch by Vijay ; reviewed by jbellis for CASSANDRA-5909
Merge branch 'cassandra-1.2' into cassandra-2.0
Additional NEWS and test fixes for 2.0 (part of CASSANDRA-5909)
CAS may return false but still commit the insert

patch by slebresne; reviewed by jbellis for CASSANDRA-6013
CAS should distinguish promised and accepted ballots

patch by slebresne; reviewed by jbellis for CASSANDRA-6023
don't declare throwing exceptions that aren't thrown
Fix paged ranges with multiple replicas

patch by slebresne; reviewed by jbellis for CASSANDRA-6004
Fix NPE during sstablesplit

patch by slebresne; reviewed by brandon.williams for CASSANDRA-6026
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix prepared statement for protocol v2

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6035
Fix potential AssertionError during tracing

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6041
Fix NPE in sstablesplit

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6027
Tuning knobs for dealing with large blobs and many CFs
patch by jbellis; reviewed by yukim and Jeremiah Jordan
merge from 1.2
Alter the wording of assassination end logging
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/gms/Gossiper.java
add file_cache_size_in_mb setting
patch by pyaskevich and jbellis for CASSANDRA-5661
merge from 1.2
Revert "add file_cache_size_in_mb setting"

This reverts commit dfe49376097cf73c04c0d8506782263a2e820cb0.
Merge branch 'cassandra-1.2' into cassandra-2.0