From: Manoop Talasila <talasila@research.att.com>
Date: Thu, 6 Jul 2017 20:38:03 +0000 (+0000)
Subject: Merge "Add proxy support in DockerFile"
X-Git-Tag: v1.3.0~61
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=commitdiff_plain;h=fec1ab242c9086a32b04e3ded4518dd20eeca7d3

Merge "Add proxy support in DockerFile"
---

fec1ab242c9086a32b04e3ded4518dd20eeca7d3
diff --cc deliveries/os_build_febe.sh
index a87831af,2d6117c3..2d6117c3
mode 100755,100644..100755
--- a/deliveries/os_build_febe.sh
+++ b/deliveries/os_build_febe.sh
diff --cc deliveries/os_settings.sh
index d4ab1853,0ad53fdc..0ad53fdc
mode 100755,100644..100755
--- a/deliveries/os_settings.sh
+++ b/deliveries/os_settings.sh