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
Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.1' into trunk
Default flush dir to data dir.
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064
Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.1' into trunk