From: Guo Ruijing <ruijing.guo@intel.com>
Date: Wed, 10 Aug 2016 05:21:54 +0000 (+0800)
Subject: Rebase OVS with DPDK
X-Git-Tag: colorado.1.rc1~45^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=55d0dfb229961c2c61b52504463ce0b93c7bdb1f;p=fuel.git

Rebase OVS with DPDK

1. Rebase OVS to commit 9f4ecd654dbcb88b15a424445184591fc887537e
2. Rebase DPDK to 16.07
3. Fix 2 vms in 2 hosts ping each other issue
4. update demo script

Change-Id: I85b56ab6e3a735bbf26df8d4df22f2d76b9fb1d3
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---

diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
index 31606a750..a8c6067aa 100644
--- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
@@ -7,6 +7,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-OVS_NSH_DPDK_BRANCH?=a58fe672a839372a576d204ec38aa0d20e28b9ed
+OVS_NSH_DPDK_BRANCH?=19d383d5e97cca390c314b64ce93dc01b9e8dc23
 OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs
 OVS_NSH_DPDK_CHANGE?=