Merge "Updated the docker manifest to version 1.2.3"

author Gary Wu <gary.i.wu@huawei.com>

Wed, 24 Oct 2018 21:27:57 +0000 (21:27 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Wed, 24 Oct 2018 21:27:57 +0000 (21:27 +0000)
author Gary Wu <gary.i.wu@huawei.com>
Wed, 24 Oct 2018 21:27:57 +0000 (21:27 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Wed, 24 Oct 2018 21:27:57 +0000 (21:27 +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	Gary Wu <gary.i.wu@huawei.com>
	Wed, 24 Oct 2018 21:27:57 +0000 (21:27 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Wed, 24 Oct 2018 21:27:57 +0000 (21:27 +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