aboutsummaryrefslogtreecommitdiffstats
path: root/patches
diff options
context:
space:
mode:
authorStanislaw Kardach <stanislaw.kardach@cavium.com>2016-05-14 23:55:11 -0700
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-16 11:47:25 +0000
commite18f9779ab00fee7f31dd1ad9002dd7b799657a8 (patch)
tree8b4e13747c43c3085c7b7418882f49deddef479e /patches
parent39f77acb6d4cdcbea04a817b01f67cad8f202c1d (diff)
Fix improperly exported patches
Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com>
Diffstat (limited to 'patches')
-rw-r--r--patches/fuel-agent/0011-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch (renamed from patches/fuel-agent/0010-target-Ubuntu-Blacklist-rtc-efi-if-not-supported.patch)0
-rw-r--r--patches/fuel-astute/0001-Increase-maximum-shell-command-timeout-to-2h.patch (renamed from patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch)0
-rw-r--r--patches/fuel-web/0005-FIXME-Disable-amd64-Liberty-on-Ubuntu-for-now.patch2
-rw-r--r--patches/fuel-web/0006-Add-configuration-item-for-WSREP-SST-provider.patch2
4 files changed, 2 insertions, 2 deletions
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
index b0c32f4f..b0c32f4f 100644
--- 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
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
index d7048954..d7048954 100644
--- a/patches/fuel-astute/0001-Increase-maximum-shell-command-timeout.patch
+++ b/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 <stanislaw.kardach@caviumnetworks.com>
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 @@