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/a06a1383
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a06a1383
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a06a1383
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/65b1e36c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65b1e36c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65b1e36c
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/53b2d9d5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53b2d9d5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53b2d9d5
Branch: