Merge "Update VPP/ODL versions for FDIO scenarios"

author Tim Rozet <trozet@redhat.com>

Fri, 28 Apr 2017 08:20:41 +0000 (08:20 +0000)

committer Gerrit Code Review <gerrit@opnfv.org>

Fri, 28 Apr 2017 08:20:41 +0000 (08:20 +0000)
author Tim Rozet <trozet@redhat.com>
Fri, 28 Apr 2017 08:20:41 +0000 (08:20 +0000)
committer Gerrit Code Review <gerrit@opnfv.org>
Fri, 28 Apr 2017 08:20:41 +0000 (08:20 +0000)
diff --cc build/overcloud-opendaylight.sh
Simple merge
diff --cc lib/overcloud-deploy-functions.sh
Simple merge
author	Tim Rozet <trozet@redhat.com>
	Fri, 28 Apr 2017 08:20:41 +0000 (08:20 +0000)
committer	Gerrit Code Review <gerrit@opnfv.org>
	Fri, 28 Apr 2017 08:20:41 +0000 (08:20 +0000)
		1	2
build/overcloud-opendaylight.sh	patch \|	diff1 \|	diff2 \|	blob \| history
lib/overcloud-deploy-functions.sh	patch \|	diff1 \|	diff2 \|	blob \| history