Merge "Take OpenStack's constraints into account"

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

Mon, 26 Jun 2017 09:15:40 +0000 (09:15 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 26 Jun 2017 09:15:40 +0000 (09:15 +0000)
author Jose Lausuch <jose.lausuch@ericsson.com>
Mon, 26 Jun 2017 09:15:40 +0000 (09:15 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 26 Jun 2017 09:15:40 +0000 (09:15 +0000)
diff --cc docker/Dockerfile
Simple merge
diff --cc docker/Dockerfile.aarch64
Simple merge
author	Jose Lausuch <jose.lausuch@ericsson.com>
	Mon, 26 Jun 2017 09:15:40 +0000 (09:15 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 26 Jun 2017 09:15:40 +0000 (09:15 +0000)
		1	2
docker/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
docker/Dockerfile.aarch64	patch \|	diff1 \|	diff2 \|	blob \| history