fix CHANGES
Merge branch 'cassandra-1.2' into cassandra-2.0
merge from 1.2
Merge branch 'cassandra-2.0' into trunk