diff options
author | 2016-04-05 12:33:16 +0200 | |
---|---|---|
committer | 2016-05-02 14:21:20 +0000 | |
commit | d12f7200df2887d40fd8102668f7b8b2eaf88a29 (patch) | |
tree | 78f69433e38a776ecbf87aabd433f20cff3265bc /patches/fuel-web | |
parent | 9450de982da1506d05d5418ceb6e53398fbd5aa1 (diff) |
Rebase after upstream bump
(cherry picked from commit 4d4bf7c29530ea85570b30ee9b351bc55825b950)
Change-Id: Ied0b2eba422aa54ecf0d4834f18a583ef0a5ffa9
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 ef3acc36..56ff4ffc 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..b76a3d3 100644 +index b8b38e2..d3d03ec 100644 --- a/nailgun/nailgun/orchestrator/deployment_serializers.py +++ b/nailgun/nailgun/orchestrator/deployment_serializers.py @@ -274,6 +274,9 @@ class DeploymentMultinodeSerializer(object): |