diff options
| author |   Stanislaw Kardach <kda@semihalf.com> | 2016-03-29 14:42:46 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-02 14:15:59 +0000 |
| commit | 6398937dfe68ad9c7ce2133c866edb6a7bd69b32 (patch) | |
| tree | e72adfd031bb09477d36723cd77609536a9f5fa3 /patches/fuel-web | |
| parent | 24428f3c202e3b889114915d06ddb1178369c117 (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>
(cherry picked from commit ccf57699bbff183ef45fd4a4e94df094ca69ee87)
Change-Id: I88be0617196bc77cf237a9818f7368f6eb78f6b3
Diffstat (limited to 'patches/fuel-web')
| -rw-r--r-- | patches/fuel-web/0004-direct-kernel-boot-for-cirros.patch | 2 |
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): |