Merge "Fix ep:1610-1 build process"

author Manoop Talasila <talasila@research.att.com>

Wed, 12 Jul 2017 16:14:24 +0000 (16:14 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Wed, 12 Jul 2017 16:14:24 +0000 (16:14 +0000)
author Manoop Talasila <talasila@research.att.com>
Wed, 12 Jul 2017 16:14:24 +0000 (16:14 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Wed, 12 Jul 2017 16:14:24 +0000 (16:14 +0000)
diff --cc deliveries/os_Dockerfile
Simple merge
diff --cc deliveries/os_build_febe.sh
Simple merge
author	Manoop Talasila <talasila@research.att.com>
	Wed, 12 Jul 2017 16:14:24 +0000 (16:14 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Wed, 12 Jul 2017 16:14:24 +0000 (16:14 +0000)
		1	2
deliveries/os_Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
deliveries/os_build_febe.sh	patch \|	diff1 \|	diff2 \|	blob \| history