Merge "Update reno for stable/ocata"
authorJenkins <jenkins@review.openstack.org>
Thu, 16 Feb 2017 13:57:07 +0000 (13:57 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 16 Feb 2017 13:57:07 +0000 (13:57 +0000)

Trivial merge