summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuijing Guo <ruijing.guo@intel.com>2017-03-17 00:17:39 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-17 00:17:39 +0000
commita8ede12de7d762f1753ad72c6339040755c57dc9 (patch)
treeb30847166adfb3a579817b67394dc6de9d60828c
parenta1667585a56b94ed4fd58a6c3a0412046905165d (diff)
parent04e5269137c6aad4fd19e3b964f4694311deb284 (diff)
Merge "Rebase to fuel ovs plugin stable/10.0" into stable/danube
-rw-r--r--build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk4
1 files changed, 2 insertions, 2 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 df2c23163..9de705aae 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?=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