diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-27 00:35:15 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-12-27 00:35:15 +0100 |
commit | d68bdf31c1c7d2d29f3524915f6a347f8d0567f5 (patch) | |
tree | 1650ea25a8cba994a95152fe5da167f35340d07d /mcp/patches/patches.list | |
parent | 6eb44a1523d8ec4083c58a89436df639c6e547cf (diff) |
patches: Squash maas region changes
When re-deploying with `-f` flag, `patch -R` cannot cleanly revert
maas region changes with overlapping context lines, so squash them
into a single file.
Change-Id: I87dae72a12fea833e9e6729de21d4ce5f262695e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches/patches.list')
-rw-r--r-- | mcp/patches/patches.list | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index 56c3f1c44..cd32378e1 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -13,5 +13,4 @@ /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch -/usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch /usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch |