Merge "Fix Panko API upgrade process" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Fri, 3 Mar 2017 22:08:26 +0000 (22:08 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 3 Mar 2017 22:08:26 +0000 (22:08 +0000)

Trivial merge