Merge "Fix the format of getting upper-constraints"

author Cedric Ollivier <cedric.ollivier@orange.com>

Tue, 7 Nov 2017 08:23:56 +0000 (08:23 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Tue, 7 Nov 2017 08:23:56 +0000 (08:23 +0000)
author Cedric Ollivier <cedric.ollivier@orange.com>
Tue, 7 Nov 2017 08:23:56 +0000 (08:23 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Tue, 7 Nov 2017 08:23:56 +0000 (08:23 +0000)
diff --cc docker/features/Dockerfile
Simple merge
diff --cc docker/smoke/Dockerfile
Simple merge
author	Cedric Ollivier <cedric.ollivier@orange.com>
	Tue, 7 Nov 2017 08:23:56 +0000 (08:23 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Tue, 7 Nov 2017 08:23:56 +0000 (08:23 +0000)
		1	2
docker/features/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history
docker/smoke/Dockerfile	patch \|	diff1 \|	diff2 \|	blob \| history