diff options
author | Ruijing Guo <ruijing.guo@intel.com> | 2016-12-07 07:47:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2016-12-07 07:47:44 +0000 |
commit | f7ba9d618c7f78ef5f452f82419136a7f024c570 (patch) | |
tree | 0df942f20b300834f4583e19ff45735c3ad60649 | |
parent | e0f9a679d5ec7310f872d3e332dc089bb603b003 (diff) | |
parent | 32e1cea9513d1ba6190e1841f2cd397c907de91b (diff) |
Merge "Enable vsperf in D release"
-rw-r--r-- | build/f_isoroot/Makefile | 2 | ||||
-rw-r--r-- | build/f_isoroot/f_vsperfpluginbuild/config.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 13f69b942..844da40e1 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,7 +11,7 @@ # Add Fuel plugin build targets here # Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have # verified it! -PLUGINS = f_ovs-nsh-dpdk-pluginbuild +PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild export PLUGINS NON_10-0_REBASED_PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_bgpvpn-pluginbuild diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk index 35f4059f1..82f0723e0 100644 --- a/build/f_isoroot/f_vsperfpluginbuild/config.mk +++ b/build/f_isoroot/f_vsperfpluginbuild/config.mk @@ -7,6 +7,6 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -VSPERF_BRANCH?=5a0c6772d255aeb0ab1e6246c91bbeb56bb3a239 +VSPERF_BRANCH?=efdc282f4b08e96f3e09d43f94ba0508e4f26090 VSPERF_REPO?=https://gerrit.opnfv.org/gerrit/vswitchperf.git VSPERF_CHANGE?= |