add missing 'stop' help back to nodetool
Merge branch 'cassandra-1.2' into trunk
typo
Merge branch 'cassandra-1.2' into trunk
fix inable -> disable edit
unused imports warnings cleanups
Merge branch 'cassandra-1.2' into trunk
Revert adding the key alias to the 2ndary indexes names (from 5378 patch)
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Fix prepared BATCH statements with batch-level timestamps

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5415
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
 Allow overriding superuser setup delay

 patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
 CASSANDRA-5430
Merge branch 'cassandra-1.2' into trunk
Change version for 1.2.4 release
Leveled compaction performs size-tiered compactions in L0
patch by tjake and jbellis for CASSANDRA-5371
r/m unused SimpleFuture
fix build post-rebase
support username/password for for jmx in shuffle tool
patch by mmichalski reviewed by dbrosius for cassandra-5431
add 5431 to CHANGES.txt
Merge branch 'cassandra-1.2' into trunk