Merge "enable http_proxy in kargo"
authorJustin chi <chigang@huawei.com>
Tue, 22 May 2018 12:32:43 +0000 (12:32 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 22 May 2018 12:32:43 +0000 (12:32 +0000)

Trivial merge