Updated Branches:
refs/heads/trunk ccbd1d528 -> b5d07e582
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5d07e58
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree
Updated Branches:
refs/heads/trunk be3a22906 -> 43f7a776f
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43f7a776
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree
Updated Branches:
refs/heads/trunk c12d7cf44 -> be89a954b
Merge branch 'cassandra-1.2' into trunk
Conflicts:
src/java/org/apache/cassandra/db/CounterColumn.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/com
Updated Branches:
refs/heads/trunk cedf6655c -> f02ee5412
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f02ee541
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree
Updated Branches:
refs/heads/cassandra-1.2 c176302bb -> edcc7f137
refs/heads/trunk 44b8789a7 -> c4481e207
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c4481e20
Tree: htt
Updated Branches:
refs/heads/trunk 46689d88d -> 85cd442e7
Merge branch 'cassandra-1.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/85cd442e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree
