Merge "Euphrates Docs update w odl scenario name cleanups"

author Dan Radez <dradez@redhat.com>

Mon, 3 Apr 2017 12:57:41 +0000 (12:57 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Mon, 3 Apr 2017 12:57:41 +0000 (12:57 +0000)
author Dan Radez <dradez@redhat.com>
Mon, 3 Apr 2017 12:57:41 +0000 (12:57 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Mon, 3 Apr 2017 12:57:41 +0000 (12:57 +0000)
diff --cc build/opnfv-environment.yaml
Simple merge
diff --cc docs/release/installation/baremetal.rst
Simple merge
diff --cc lib/overcloud-deploy-functions.sh
Simple merge
author	Dan Radez <dradez@redhat.com>
	Mon, 3 Apr 2017 12:57:41 +0000 (12:57 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Mon, 3 Apr 2017 12:57:41 +0000 (12:57 +0000)
		1	2
build/opnfv-environment.yaml	patch \|	diff1 \|	diff2 \|	blob \| history
docs/release/installation/baremetal.rst	patch \|	diff1 \|	diff2 \|	blob \| history
lib/overcloud-deploy-functions.sh	patch \|	diff1 \|	diff2 \|	blob \| history