summaryrefslogtreecommitdiffstats
path: root/build/f_isoroot
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2016-11-18 12:45:37 +0300
committerMichael Polenchuk <mpolenchuk@mirantis.com>2016-12-08 19:35:49 +0400
commit184e6a367e889df2bceab0ee137a54dbce50edc3 (patch)
tree37a1e65326f89a394a4b02810f6a4d0c742d9a25 /build/f_isoroot
parentf7ba9d618c7f78ef5f452f82419136a7f024c570 (diff)
Turn kvm-plugin back on
Change-Id: I7c46f263ec584b09b6022d9e961ae3c44c642954 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'build/f_isoroot')
-rw-r--r--build/f_isoroot/Makefile2
-rw-r--r--build/f_isoroot/f_kvm-pluginbuild/config.mk4
2 files changed, 3 insertions, 3 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 844da40e1..e189e1697 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 f_vsperfpluginbuild
+PLUGINS = f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild
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_kvm-pluginbuild/config.mk b/build/f_isoroot/f_kvm-pluginbuild/config.mk
index eaef3d414..fa284b3e2 100644
--- a/build/f_isoroot/f_kvm-pluginbuild/config.mk
+++ b/build/f_isoroot/f_kvm-pluginbuild/config.mk
@@ -7,6 +7,6 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-KVMFORNFV_BRANCH=stable/colorado
+KVMFORNFV_BRANCH=master
KVMFORNFV_REPO=https://gerrit.opnfv.org/gerrit/kvmfornfv
-KVMFORNFV_CHANGE=e6588d1d59d7ac24f25f644650e6845561dd441b
+KVMFORNFV_CHANGE=ec568fdb37d280371733cab5e9fad030557f6921