Merge "Sets baremetal workers to 12"

author Tim Rozet <trozet@redhat.com>

Wed, 9 Aug 2017 20:11:10 +0000 (20:11 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Wed, 9 Aug 2017 20:11:10 +0000 (20:11 +0000)
author Tim Rozet <trozet@redhat.com>
Wed, 9 Aug 2017 20:11:10 +0000 (20:11 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Wed, 9 Aug 2017 20:11:10 +0000 (20:11 +0000)
diff --cc build/undercloud.sh
Simple merge
diff --cc lib/overcloud-deploy-functions.sh
Simple merge
author	Tim Rozet <trozet@redhat.com>
	Wed, 9 Aug 2017 20:11:10 +0000 (20:11 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Wed, 9 Aug 2017 20:11:10 +0000 (20:11 +0000)
		1	2
build/undercloud.sh	patch \|	diff1 \|	diff2 \|	blob \| history
lib/overcloud-deploy-functions.sh	patch \|	diff1 \|	diff2 \|	blob \| history