Merge "Prepare 6.1.0 (ocata)" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Thu, 27 Apr 2017 20:20:53 +0000 (20:20 +0000)
committerGerrit Code Review <review@openstack.org>
Thu, 27 Apr 2017 20:20:53 +0000 (20:20 +0000)

Trivial merge