r/m code to load deprecated, pre-1.2 cache format
patch by jbellis; reviewed by Vijay for CASSANDRA-6031
Merge branch 'cassandra-2.0' into trunk
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)
Merge branch 'cassandra-2.0' into trunk
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
Merge branch 'cassandra-2.0' into trunk
don't declare throwing exceptions that aren't thrown
Merge branch 'cassandra-2.0' into trunk
Fix paged ranges with multiple replicas

patch by slebresne; reviewed by jbellis for CASSANDRA-6004
Merge branch 'cassandra-2.0' into trunk
Fix NPE during sstablesplit

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

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6035
Merge branch 'cassandra-2.0' into trunk
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