[10/15] git commit: merge from 2.0

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/81f8e370 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/81f8e370 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/81f8e370

[10/15] git commit: merge from 2.0

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/105dcdbf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/105dcdbf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/105dcdbf