Merge "Add workflow designer to integrate"

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

Thu, 16 Nov 2017 06:14:06 +0000 (06:14 +0000)

committer Gerrit Code Review <gerrit@onap.org>

Thu, 16 Nov 2017 06:14:06 +0000 (06:14 +0000)
author Gary Wu <gary.i.wu@huawei.com>
Thu, 16 Nov 2017 06:14:06 +0000 (06:14 +0000)
committer Gerrit Code Review <gerrit@onap.org>
Thu, 16 Nov 2017 06:14:06 +0000 (06:14 +0000)
diff --cc version-manifest/src/main/resources/docker-manifest.csv
Simple merge
diff --cc version-manifest/src/main/resources/java-manifest.csv
Simple merge
author	Gary Wu <gary.i.wu@huawei.com>
	Thu, 16 Nov 2017 06:14:06 +0000 (06:14 +0000)
committer	Gerrit Code Review <gerrit@onap.org>
	Thu, 16 Nov 2017 06:14:06 +0000 (06:14 +0000)
		1	2
version-manifest/src/main/resources/docker-manifest.csv	patch \|	diff1 \|	diff2 \|	blob \| history
version-manifest/src/main/resources/java-manifest.csv	patch \|	diff1 \|	diff2 \|	blob \| history