Merge "Revert "xci: osa: Disable haproxy ssl configuration""
authorMarkos Chandras <mchandras@suse.de>
Mon, 3 Sep 2018 09:07:21 +0000 (09:07 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Mon, 3 Sep 2018 09:07:21 +0000 (09:07 +0000)

Trivial merge