Merge "Revert nokiav2 back to newer versions" into casablanca

author Yang Xu <yang.xu3@huawei.com>

Fri, 16 Nov 2018 05:18:03 +0000 (05:18 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Fri, 16 Nov 2018 05:18:03 +0000 (05:18 +0000)
author Yang Xu <yang.xu3@huawei.com>
Fri, 16 Nov 2018 05:18:03 +0000 (05:18 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Fri, 16 Nov 2018 05:18:03 +0000 (05:18 +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	Yang Xu <yang.xu3@huawei.com>
	Fri, 16 Nov 2018 05:18:03 +0000 (05:18 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Fri, 16 Nov 2018 05:18:03 +0000 (05:18 +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