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/fdae99d7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fdae99d7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fdae99d7
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/2574f05b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2574f05b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2574f05b
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/0851fd74
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0851fd74
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0851fd74
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/b41eb4ad
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b41eb4ad
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b41eb4ad