[2/3] cassandra git commit: Fix merge

Fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f5dd225 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f5dd225 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f5dd225 Branch:

[2/3] cassandra git commit: fix merge

fix merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2a167ea2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2a167ea2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2a167ea2 Branch: