Merge branch 'cassandra-1.2' into trunk
dsnitch severity is not correctly set for compaction info
patch by Vijay; reviewed by jbellis for CASSANDRA-5255
Merge branch 'cassandra-1.2' into trunk
more descriptive exception message
Merge branch 'cassandra-1.2' into trunk
rename constants to uppercase
replace ipv6 colons in jmx object names
patch by Michał Michalski; reviewed by jbellis for CASSANDRA-5298
Merge branch 'cassandra-1.2' into trunk
Support null values in PreparedStatements parameters

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5081
Add netty to pom dependencies

patch by slebresne; reviewed by dbrosius for CASSANDRA-5181
Merge branch 'cassandra-1.2' into trunk
Thrift CQLPreparedResult don't include type arguments

patch by slebresne; reviewed by jbellis for CASSANDRA-5311
Add tool to reset SSTable level; patch by Marcus Eriksson, reviewed by yukim for CASSANDRA-5271
Fix compaction not removing columns when bf_fp_ratio is 1; patch by yukim, reviewed by jbellis and pcmanus for CASSANDRA-5182
Merge branch 'cassandra-1.2' into trunk
Revert "add single-CF specialization of RowMutation constructor"

This reverts commit a9b075d5fa9d6ee9df1d30a6ee969896b3b99f63.
Revert "Revert "add single-CF specialization of RowMutation constructor""

This reverts commit ecaa6cd1b74b8caeec03e505f04d676414bb633d.
make RowMutation mutable again in SystemTable.serializeSchema
cli: Warn about missing CQL3 tables in schema descriptions

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5309
Merge branch 'cassandra-1.2' into trunk