add setcompactionthreshold back to nodetool help
Merge branch 'cassandra-1.2' into trunk