aboutsummaryrefslogtreecommitdiffstats
path: root/patches/fuel-web
diff options
context:
space:
mode:
authorStanislaw Kardach <kda@semihalf.com>2016-03-29 14:42:46 +0200
committerStanislaw Kardach <kda@semihalf.com>2016-03-29 15:07:29 +0200
commitccf57699bbff183ef45fd4a4e94df094ca69ee87 (patch)
treed9944c56ff1126f3bdbb6afaaba8f862c6b5352b /patches/fuel-web
parentf101dd4429858b1b313eec81959576d974b34f23 (diff)
Rebase patches and fix importing
* We were missing the patch rebase changes that were introduced by gerrit automatic upstream project update for submodules. This patch introduces them. * Apply all submodule patches a single `git am` call to help with rebasing patches. * Correct Opendaylight plugin initialization in repo config. Signed-off-by: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
Diffstat (limited to 'patches/fuel-web')
-rw-r--r--patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch
index 0d133274..bec998f9 100644
--- a/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch
+++ b/patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch
@@ -35,7 +35,7 @@ index 16dc3fa..23d6589 100644
class VmwareDeploymentSerializerMixin(object):
diff --git a/nailgun/nailgun/orchestrator/deployment_serializers.py b/nailgun/nailgun/orchestrator/deployment_serializers.py
-index b8b38e2..54b1614 100644
+index b8b38e2..b76a3d3 100644
--- a/nailgun/nailgun/orchestrator/deployment_serializers.py
+++ b/nailgun/nailgun/orchestrator/deployment_serializers.py
@@ -274,6 +274,9 @@ class DeploymentMultinodeSerializer(object):