diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-29 18:19:49 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-29 18:22:05 +0200 |
commit | 2028f8bbf4901f0e8facd64073ce8243ed51c893 (patch) | |
tree | 669001dce413d246b77a8178facf14402a13b398 | |
parent | c1a2c0e7840a1d1d89044d6767ffd14ad94e8949 (diff) |
u/fuel: Bump & rebase for MaaS fabric extension
Change-Id: I13798e519c6527499eaa6ba996c0123c0861ab5d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r-- | patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch | 4 | ||||
m--------- | upstream/fuel | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch index 11abe1dd..9606e8a6 100644 --- a/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch +++ b/patches/opnfv-fuel/0003-virtng.py-virt.sls-Extend-libvirt_domain.patch @@ -150,10 +150,10 @@ index 00000000..78eb0bff + + #salt_control_seed_{{ cluster_name }}_{{ node_name }}: diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list -index a17fd694..6dd688ee 100644 +index 17573d95..5c6a7562 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list -@@ -11,3 +11,5 @@ +@@ -12,3 +12,5 @@ /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch /usr/share/salt-formulas/env: 0015-Set-ovs-bridges-as-L3-interfaces.patch diff --git a/upstream/fuel b/upstream/fuel -Subproject b52ef6ea62f43de4b91e2becd92a3282e569925 +Subproject 5d54a99cb71172e5ccb1bff94bdd98c3212bd76 |