[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Merge branch 'cassandra-3.0' into cassandra-3.7 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/40e4b0b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40e4b0b0 Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Merge branch 'cassandra-3.0' into cassandra-3.7 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/22e0a1da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/22e0a1da Diff:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Merge branch 'cassandra-3.0' into cassandra-3.7 Conflicts: CHANGES.txt src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a2dd0051 Tree:

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.7

Merge branch 'cassandra-3.0' into cassandra-3.7 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/Keyspace.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f24e0667 Tree: