[09/11] git commit: merge from 1.2

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/810f0678 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/810f0678 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/810f0678

[09/11] git commit: merge from 1.2

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/9620e0cc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9620e0cc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9620e0cc

[09/11] git commit: merge from 1.2

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/7d8a56df Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d8a56df Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7d8a56df