summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-06-29 11:16:51 +0200
committerNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-07-01 11:56:41 +0000
commit0330037417ae9ae280fdb76ac99ee464dc4a6d1d (patch)
treec0f759981ed2e5f4cc37d6abf32b187a5ec40c6f /build/f_isoroot
parent65f0209484dbd2851bae5323b294c7289596e214 (diff)
[BGPVPN] Uplift plugin to Mitaka
Change-Id: I9db366806ec97b44b0e537ee2d4beb3c8a968b92 Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Diffstat (limited to 'build/f_isoroot')
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_bgpvpn-pluginbuild/config.mk2
-rw-r--r--build/f_isoroot/f_odlpluginbuild/config.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index e80b95e72..51b8f26fa 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 Mitaka uplift. Please re-enable your plugin as you have
# verified it!
-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild
+PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild f_kvm-pluginbuild f_bgpvpn-pluginbuild
#PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
export PLUGINS
#NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
diff --git a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
index a5f9ad966..e0e7b57df 100644
--- a/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
+++ b/build/f_isoroot/f_bgpvpn-pluginbuild/config.mk
@@ -9,4 +9,4 @@
BGPVPN_BRANCH=master
BGPVPN_REPO="https://github.com/openstack/fuel-plugin-bgpvpn.git"
-BGPVPN_CHANGE=fb8a9ad29f85bd0902db6701f31810aa8015a4fc
+BGPVPN_CHANGE=31cffef955f855c817eb3c960532e2ed1442c32c
diff --git a/build/f_isoroot/f_odlpluginbuild/config.mk b/build/f_isoroot/f_odlpluginbuild/config.mk
index 7e68245c3..9a11ffa6b 100644
--- a/build/f_isoroot/f_odlpluginbuild/config.mk
+++ b/build/f_isoroot/f_odlpluginbuild/config.mk
@@ -8,7 +8,7 @@
##############################################################################
ODL_BRANCH ?= master
-ODL_CHANGE ?= ae7f56df70acb92f78150c5461d84896e6aef1b4
+ODL_CHANGE ?= c539dc87d905e9c9992d6624c11814c4eda4c5ca
ODL_REPO ?= https://github.com/openstack/fuel-plugin-opendaylight.git
FPB_BRANCH ?= master