[06/15] 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/40deb911 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40deb911 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40deb911

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