Move System.exit on OOM into a separate thread
patch by jbellis; reviewed by marcuse for CASSANDRA-5273
Merge branch 'cassandra-1.2' into trunk
inline sendMessages
cleanup and simplify; only need to create one MessageOut
Exclude localTimestamp from merkle tree calculation for tombstones patch by Christian Spriegel; reviewed by yukim for CASSANDRA-5398
Merge branch 'cassandra-1.2' into trunk
remove on-heap row cache

Removed on-heap row cache
patch by jbellis; reviewed by jasobrown for CASSANDRA-5348
remove unused field RandomPartitioner.DELIMITER_BYTE
comment
Merge branch 'cassandra-1.2' into trunk
Remove the unused defaultConsistency from ModificationStatement
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Ignore pre-truncate hints
patch by Alexey Zotov and jbellis; reviewed by vijay for CASSANDRA-4655
merge from 1.2
Ignore pre-truncate hints
patch by Alexey Zotov and jbellis; reviewed by vijay for CASSANDRA-4655
Merge remote-tracking branch 'origin/trunk' into trunk
fix typo in removeTruncationRecord
merge from 1.2
improve cell index tracing
fix NPE