Merge "Add release notes for Ocata 6.0.0"
authorJenkins <jenkins@review.openstack.org>
Thu, 26 Jan 2017 01:07:26 +0000 (01:07 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 26 Jan 2017 01:07:26 +0000 (01:07 +0000)

Trivial merge