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/45a6373e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45a6373e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/45a6373e
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/e0718bcd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0718bcd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e0718bcd
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/8e101bef
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8e101bef
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8e101bef