Current Branch Merge Path - PLEASE READ!

[Michael Shuler]

The current branch merge path is, in full:

cassandra-2.1
 |
 cassandra-2.2
  |
  cassandra-3.0
   |
   cassandra-3.11
    |
    cassandra-3.X
     |
     trunk

Wherever you start, please follow through the complete path to trunk.

I reopened JIRAs #12768, #12817, and #12694 for skipping cassandra-3.11.
Owners of those tickets, please commit to the cassandra-3.11 branch and
merge up. There were too many conflicts for me to comfortably try to
resolve on a straight merge from 3.0.

-- 
Kind regards,
Michael