Merge "fix maven local build issue"

author Dan Timoney <dtimoney@att.com>

Thu, 18 May 2017 19:45:51 +0000 (19:45 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 18 May 2017 19:45:51 +0000 (19:45 +0000)
author Dan Timoney <dtimoney@att.com>
Thu, 18 May 2017 19:45:51 +0000 (19:45 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 18 May 2017 19:45:51 +0000 (19:45 +0000)
diff --cc admportal/src/assembly/assemble_zip.xml
Simple merge
diff --cc platform-logic/installer/src/assembly/assemble_zip.xml
Simple merge
author	Dan Timoney <dtimoney@att.com>
	Thu, 18 May 2017 19:45:51 +0000 (19:45 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 18 May 2017 19:45:51 +0000 (19:45 +0000)
		1	2
admportal/src/assembly/assemble_zip.xml	patch \|	diff1 \|	diff2 \|	blob \| history
platform-logic/installer/src/assembly/assemble_zip.xml	patch \|	diff1 \|	diff2 \|	blob \| history