merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df103258
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df103258
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df103258
merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32f5d064
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32f5d064
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/32f5d064