Merge branch 'cassandra-3.11' into trunk * 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/2d8be34a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d8be34a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d8be34a Branch: refs/heads/trunk Commit: 2d8be34a240db84d4368a4d30a2258ca6e67043f Parents: 831c05b 1dc1aa1 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Feb 23 15:48:25 2017 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Feb 23 15:48:25 2017 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------