Merge "Set proxies in Cloudify container" into stable/iruya
authorJuha Kosonen <juha.kosonen@nokia.com>
Wed, 26 Jun 2019 06:31:57 +0000 (06:31 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 26 Jun 2019 06:31:57 +0000 (06:31 +0000)

Trivial merge