Merge "xci: osa: Disable haproxy ssl configuration"
authorMarkos Chandras <mchandras@suse.de>
Thu, 5 Jul 2018 07:51:11 +0000 (07:51 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 5 Jul 2018 07:51:11 +0000 (07:51 +0000)

Trivial merge