Rebase to fuel ovs plugin stable/10.0

Change-Id: Ib1cce4ca265ec8716272597aeff97d8195276e61
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 df2c231..9de705a 100644 (file)
--- 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?=master
+OVS_NSH_DPDK_BRANCH?=stable/10.0
 OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs
-OVS_NSH_DPDK_CHANGE?=24b1dd4464f6b86d73b15a4b3f0984a2d597750f
+OVS_NSH_DPDK_CHANGE?=a77ce892047fe1ca257bd199d0abf2d2a046c8a3