diff options
| author |   Fedor Zhadaev <fzhadaev@mirantis.com> | 2016-12-09 05:31:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-12-09 05:31:12 +0000 |
| commit | ab2289a44a4026bf77d6ee9b55ded23c0c08d545 (patch) | |
| tree | a8c08cd9a5c9631f45ac4b64c9245e10da4a537d /build | |
| parent | 93fa5e80104a18bee70b24b38b4743008d161920 (diff) | |
| parent | 184e6a367e889df2bceab0ee137a54dbce50edc3 (diff) | |
Merge "Turn kvm-plugin back on"
Diffstat (limited to 'build')
| -rw-r--r-- | build/f_isoroot/Makefile | 2 | ||||
| -rw-r--r-- | build/f_isoroot/f_kvm-pluginbuild/config.mk | 4 |
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 |