Updated Branches:
refs/heads/cassandra-1.0 08c654601 - d3917260b
refs/heads/cassandra-1.1 567146e49 - 06893e4ff
Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit:
Updated Branches:
refs/heads/cassandra-1.1 cc68c49f4 - 698a2bbea
Merge branch 'cassandra-1.0' into cassandra-1.1
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/698a2bbe
Tree: