Merge "Add support for upgrading ec2-api" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Wed, 1 Mar 2017 06:49:17 +0000 (06:49 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 1 Mar 2017 06:49:17 +0000 (06:49 +0000)

Trivial merge