diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-25 16:14:12 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-25 16:14:12 +0000 |
commit | be929d5e65b7b2362f92c935c199fe901b7f32d1 (patch) | |
tree | 45a6658dbf5e1fb8b890e083438f7d95c2875688 /patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch | |
parent | 0b12b1413d8a249e4ab5570749d1b0b6fbfd2fbc (diff) | |
parent | 5dc680ca9524d8f2bd4ef1e2c198203a4c68480d (diff) |
Merge "Fix improper patch rebase"
Diffstat (limited to 'patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch')
-rw-r--r-- | patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch b/patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch index 00f23f60..776ae32c 100644 --- a/patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch +++ b/patches/fuel-web/0005-FIXME-Disable-amd64-Mitaka-on-Ubuntu-for-now.patch @@ -13,22 +13,22 @@ Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 1 file changed, 2 insertions(+) diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml -index 62e6b73..7d7ffa6 100644 +index d3226da..7e6e96e 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml -@@ -1977,6 +1977,7 @@ +@@ -1978,6 +1978,7 @@ extend: *base_release fields: name: "Mitaka on Ubuntu 14.04" + state: "unavailable" version: "mitaka-9.0" + arch: "amd64" operating_system: "Ubuntu" - description: "This option will install the OpenStack Mitaka packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." -@@ -2218,6 +2219,7 @@ +@@ -2220,6 +2221,7 @@ extend: *ubuntu_release fields: name: "Mitaka on Ubuntu+UCA 14.04" + state: "unavailable" version: "mitaka-9.0" + arch: "amd64" description: "This option will install the OpenStack Mitaka packages using Ubuntu as a base operating system, including Ubuntu Cloud Archive OpenStack packages. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." - attributes_metadata: |