Merge "Add VnfOnBoarding Abstraction"

author Jose Lausuch <jose.lausuch@ericsson.com>

Wed, 18 Jan 2017 16:45:13 +0000 (16:45 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Wed, 18 Jan 2017 16:45:13 +0000 (16:45 +0000)
author Jose Lausuch <jose.lausuch@ericsson.com>
Wed, 18 Jan 2017 16:45:13 +0000 (16:45 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Wed, 18 Jan 2017 16:45:13 +0000 (16:45 +0000)
diff --cc docker/Dockerfile
Simple merge
diff --cc functest/ci/config_functest.yaml
Simple merge
diff --cc functest/ci/testcases.yaml
Simple merge
author	Jose Lausuch <jose.lausuch@ericsson.com>
	Wed, 18 Jan 2017 16:45:13 +0000 (16:45 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Wed, 18 Jan 2017 16:45:13 +0000 (16:45 +0000)
		1	2
docker/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
functest/ci/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
functest/ci/testcases.yaml	patch \|	diff1 \|	diff2 \|	blob \| history