Updated Branches:
refs/heads/trunk 2f115d434 -> e594e0dca
Merge branch cassandra-1.0 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e594e0dc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e
Updated Branches:
refs/heads/trunk b3a378c02 -> cfd9399dc
Merge branch 'cassandra-1.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfd9399d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree