merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b9de5de2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9de5de2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9de5de2
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a751d04d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a751d04d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a751d04d
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1137f989
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1137f989
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1137f989
Updated Branches:
refs/heads/cassandra-1.2 21f63a916 - aa90c88be
refs/heads/trunk 0467c19d9 - f112f992b
merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f112f992
Tree: