Merge "Fix refstack_defcore"

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

Thu, 29 Jun 2017 07:35:17 +0000 (07:35 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 29 Jun 2017 07:35:17 +0000 (07:35 +0000)
author Jose Lausuch <jose.lausuch@ericsson.com>
Thu, 29 Jun 2017 07:35:17 +0000 (07:35 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 29 Jun 2017 07:35:17 +0000 (07:35 +0000)
diff --cc docker/Dockerfile
Simple merge
diff --cc docker/Dockerfile.aarch64
Simple merge
diff --cc functest/ci/config_functest.yaml
Simple merge
author	Jose Lausuch <jose.lausuch@ericsson.com>
	Thu, 29 Jun 2017 07:35:17 +0000 (07:35 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 29 Jun 2017 07:35:17 +0000 (07:35 +0000)
		1	2
docker/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
docker/Dockerfile.aarch64	patch \|	diff1 \|	diff2 \|	blob \| history
functest/ci/config_functest.yaml	patch \|	diff1 \|	diff2 \|	blob \| history