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)
commit1ab18342023458c58e6771b94c22ede89c917af3
tree7a4d61276d043e725c00d1ec8589d1e99d55fbe6
parent6de989b987f9b34801a6274ae28917a59156dc97
parente082540d86e8f1727e1d01321a181ef98cfab13e
Merge "upgrades: fix ec2api conditional" into stable/ocata