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

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1

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

patch by slebresne; reviewed by thobbs for CASSANDRA-7052
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Default flush dir to data dir.
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064
Use timestamp from the statement instead of "now"

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for CASSANDRA-7053
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
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
Nodetool rebuild_index requires named indexes argument

patch by Stunnicliffe reviewed by dbrosius for cassandra-7038
fix bad merge
Fix CQL version number for CASSANDRA-7055
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
remove invalid assert
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6987