[4/4] 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/34235ad7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34235ad7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34235ad7 Branch:

[4/4] git commit: fix merge from 1.1

fix merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/66001665 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/66001665 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/66001665