Merge "base image: Explicitly call kpartx"

author Michael Polenchuk <mpolenchuk@mirantis.com>

Thu, 7 Dec 2017 08:15:12 +0000 (08:15 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Thu, 7 Dec 2017 08:15:12 +0000 (08:15 +0000)
author Michael Polenchuk <mpolenchuk@mirantis.com>
Thu, 7 Dec 2017 08:15:12 +0000 (08:15 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Thu, 7 Dec 2017 08:15:12 +0000 (08:15 +0000)
diff --cc ci/deploy.sh
Simple merge
diff --cc mcp/scripts/lib.sh
Simple merge
author	Michael Polenchuk <mpolenchuk@mirantis.com>
	Thu, 7 Dec 2017 08:15:12 +0000 (08:15 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Thu, 7 Dec 2017 08:15:12 +0000 (08:15 +0000)
		1	2
ci/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
mcp/scripts/lib.sh	patch \|	diff1 \|	diff2 \|	blob \| history