cleanup
CHANGES
merge
Fix changelog
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Queries on compact tables can return more results than requested

patch by slebresne; reviewed by thobbs for CASSANDRA-7052
Use timestamp from the statement instead of "now"

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7053
Nodetool rebuild_index requires named indexes argument

patch by Stunnicliffe reviewed by dbrosius for cassandra-7038
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix CQL version number for CASSANDRA-7055
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Log a warning for large batches
patch by Lyuben Todorov; reviewed by Benedict Elliott Smith for CASSANDRA-6487
Fix schema concurrency exceptions (backport of #6841)
Merge branch 'cassandra-1.2' into cassandra-2.0
Don't NPE when username is supplied but password isn't.

Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7050
Fix performance regression from CASSANDRA-5614

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6949
Use LOCAL_QUORUM fordata reads at LOCAL_SERIAL
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6939
Ensure that batchlog and hint timeouts do not produce hints

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

Conflicts:
	src/java/org/apache/cassandra/net/MessagingService.java
Post-CASSANDRA-7058 fix