Merge branch 'cassandra-3.11' into trunk
authorAleksey Yeshchenko <aleksey@apple.com>
Mon, 14 Jan 2019 18:07:48 +0000 (18:07 +0000)
committerAleksey Yeshchenko <aleksey@apple.com>
Mon, 14 Jan 2019 18:07:48 +0000 (18:07 +0000)

Trivial merge