[21/23] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2018-01-15 Thread jasobrown
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02bbdd63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02bbdd63 Diff: http://git-wip-us.apache.org/repos/as

[21/23] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.11

2017-02-15 Thread mshuler
Merge branch 'cassandra-3.0' into cassandra-3.11 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cc405c0b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cc405c0b Diff: http://git-wip-us.apache.org/repos/as