Updated Branches:
refs/heads/cassandra-1.2 794623441 -> b9ded6456
Merge branch 'cassandra-1.2' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apac
Updated Branches:
refs/heads/cassandra-1.2 205a9939c -> d64dc2eb3
Merge branch 'cassandra-1.2' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commi
Updated Branches:
refs/heads/cassandra-1.2 43c9e8156 -> 26fdab378
Merge branch 'cassandra-1.2' of
https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commi