aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-01-02 14:42:31 -0800
committerGuo Ruijing <ruijing.guo@intel.com>2017-01-02 14:43:43 -0800
commit8e8ee8039d33cbe23c4f5beafcb2d8bc780d8d53 (patch)
tree84fb9b4e19a56a5161ae206e534c6b9156edafc6
parent02fb19bb23fde65f048ee5b747a6c42cb800d0b1 (diff)
Rebase to ovs 2.6.x and NSH
1. rebase to latest ovs without NSH 2. rebase to ovs 2.6.1 with NSH Change-Id: I5481422e55fc65f48b78b4779119d9ff19868a91 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk2
1 files changed, 1 insertions, 1 deletions
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 8d267d249..49680f418 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?=a8f78d202d502f0bc51d12d88b39905a8e8278e8
+OVS_NSH_DPDK_BRANCH?=d0487867be45c6e785f9fb241efd6adef0f0625f
OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs
OVS_NSH_DPDK_CHANGE?=