Merge "upgrades: fix ec2api conditional"
authorJenkins <jenkins@review.openstack.org>
Wed, 1 Mar 2017 03:56:03 +0000 (03:56 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 1 Mar 2017 03:56:03 +0000 (03:56 +0000)

Trivial merge