Merge "Update Manifest for MUSIC" into casablanca

author Helen Chen <helen.chen@huawei.com>

Fri, 16 Nov 2018 01:05:38 +0000 (01:05 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Fri, 16 Nov 2018 01:05:38 +0000 (01:05 +0000)
author Helen Chen <helen.chen@huawei.com>
Fri, 16 Nov 2018 01:05:38 +0000 (01:05 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Fri, 16 Nov 2018 01:05:38 +0000 (01:05 +0000)
diff --cc version-manifest/src/main/resources/docker-manifest-staging.csv
Simple merge
diff --cc version-manifest/src/main/resources/docker-manifest.csv
Simple merge
author	Helen Chen <helen.chen@huawei.com>
	Fri, 16 Nov 2018 01:05:38 +0000 (01:05 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Fri, 16 Nov 2018 01:05:38 +0000 (01:05 +0000)
		1	2
version-manifest/src/main/resources/docker-manifest-staging.csv	patch \|	diff1 \|	diff2 \|	blob \| history
version-manifest/src/main/resources/docker-manifest.csv	patch \|	diff1 \|	diff2 \|	blob \| history