merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e961ac92
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e961ac92
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e961ac92
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3595131d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3595131d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3595131d
merge from 2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43ad56bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/43ad56bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/43ad56bd