[21/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be99f44e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be99f44e Diff:

[21/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2b8cdc23 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b8cdc23 Diff:

[21/22] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1

Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1fe90d34 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1fe90d34 Diff: