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/532db4d2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/532db4d2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/532db4d2
Branch:
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/26018be2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26018be2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26018be2
Branch:
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/3852085a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3852085a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3852085a
Branch: