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)
commit0b8fa1c7fecf0a95029a25a1e38218e55f085db6
treeb8b6c39c3c6b30619412a63ebf6a7f2e5f48e05e
parent0eb083109994f07921891316355ec32612c0d6a3
parentb67f77e43bc12c90cab94b6d9b0032ec4b2c15ce
Merge "Prepare 6.1.0 (ocata)" into stable/ocata