From e18f9779ab00fee7f31dd1ad9002dd7b799657a8 Mon Sep 17 00:00:00 2001 From: Stanislaw Kardach Date: Sat, 14 May 2016 23:55:11 -0700 Subject: [PATCH] Fix improperly exported patches Signed-off-by: Stanislaw Kardach --- ...atch => 0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch} | 0 ...ut.patch => 0001-Increase-maximum-shell-command-timeout-to-2h.patch} | 0 .../fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch | 2 +- .../fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) rename patches/fuel-agent/{0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch => 0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch} (100%) rename patches/fuel-astute/{0001-Increase-maximum-shell-command-timeout.patch => 0001-Increase-maximum-shell-command-timeout-to-2h.patch} (100%) diff --git a/patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch b/patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch similarity index 100% rename from patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch rename to patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch diff --git a/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch b/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch similarity index 100% rename from patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch rename to patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch diff --git a/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch b/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch index 243d9c85..da231cb4 100644 --- a/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch +++ b/patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch @@ -11,7 +11,7 @@ TODO: maybe rename above fixture to include arch in name. 1 file changed, 1 insertion(+) diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml -index 4979fb5..037ceba 100644 +index 9da1346..f798830 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml @@ -1986,6 +1986,7 @@ diff --git a/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch b/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch index dacb26de..dc6c4b3e 100644 --- a/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch +++ b/patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch @@ -12,7 +12,7 @@ Signed-off-by: Stanislaw Kardach 1 file changed, 21 insertions(+) diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml -index 037ceba..598cf77 100644 +index f798830..c99e91a 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml @@ -856,6 +856,27 @@ -- 2.16.6