Merge "upgrades: fix ec2api conditional" into stable/ocata
authorJenkins <jenkins@review.openstack.org>
Wed, 1 Mar 2017 07:17:47 +0000 (07:17 +0000)
committerGerrit Code Review <review@openstack.org>
Wed, 1 Mar 2017 07:17:47 +0000 (07:17 +0000)

Trivial merge