[openstack-nova] Update to 2011.3.1 release candidate

Mark McLoughlin markmc at fedoraproject.org
Tue Jan 17 14:12:21 UTC 2012


commit ad7d83269c7e7d4d687cc6e5ad337d9b568c8d6b
Author: Mark McLoughlin <markmc at redhat.com>
Date:   Tue Jan 17 14:11:42 2012 +0000

    Update to 2011.3.1 release candidate
    
    Only adds 4 patches from upstream which we didn't already have

 .gitignore                                         |    3 +-
 ...hain-rule-for-EC2-metadata-requests-lp-85.patch |    2 +-
 0001-Add-tools-rfc.sh-from-master.patch            |  175 ---
 0002-Don-t-use-GitPython-for-authors-check.patch   |   81 --
 ...pi-add-the-INPUT-rule-for-EC2-metadata-lp.patch |    4 +-
 ...ser-to-choose-either-ietadm-or-tgtadm-lp-.patch |    2 +-
 ...Made-jenkins-email-pruning-more-resilient.patch |   28 -
 ...e-VolumeDriver.sync_exec-method-lp-819997.patch |    2 +-
 0004-Removing-old-code-that-snuck-back-in.patch    |   77 -
 ...outstanding-pep8-errors-for-a-clean-trunk.patch |  675 ---------
 ...tadm-tgtadm-calls-out-into-helper-classes.patch |    2 +-
 ...tgtadm-off-by-one-error.-Fixes-bug-871278.patch |    2 +-
 0006-Point-tools-rfc.sh-at-the-right-branch.patch  |   26 -
 ...57-abstract-out-disk-image-access-methods.patch |    2 +-
 ...kes-sure-to-recreate-gateway-for-moved-ip.patch |  120 --
 ...7-support-handling-images-with-libguestfs.patch |    2 +-
 ...y-qualified-domain-name-in-local-hostname.patch |  103 --
 ...estfs-operation-with-specified-partitions.patch |    6 +-
 ...e-grantee-group-loading-for-source-groups.patch |   38 -
 ...ders-when-auth_token-is-None.-Fixes-bug-8.patch |   28 -
 ...e-don-t-access-the-net-when-building-docs.patch |    2 +-
 ...pool-complexities-from-nova.db.sqlalchemy.patch |   95 --
 0012-Raise-InsufficientFreeMemory.patch            |   69 -
 0013-Don-t-leak-exceptions-out-to-users.patch      |   36 -
 ...snapshots-work-for-amis.-Fixes-bug-873156.patch |  166 ---
 0015-Add-missing-author.patch                      |   25 -
 0016-Make-snapshots-private-by-default.patch       |   30 -
 ...ackups-can-no-longer-happen-simultaneousl.patch |  196 ---
 0018-Fixed-bug-lp850602.patch                      |  119 --
 0019-bug-861310.patch                              |   31 -
 0020-Enforce-snapshot-cleanup.patch                |   90 --
 0021-bug-lp845714.patch                            |  100 --
 ...-version-specifier-to-kombu-in-pip-requir.patch |   31 -
 ...nant-id-to-the-create-images-response-Loc.patch |   55 -
 ...-bug-862633-OS-api-consoles-create-broken.patch |  270 ----
 0025-Deallocate-ip-if-build-fails.patch            |  159 --
 ...p-returning-correct-password-on-api-calls.patch |   76 -
 0027-Handle-pidfile-exception-for-dnsmasq.patch    |   51 -
 0028-Make-sure-unknown-extensions-return-404.patch |   58 -
 ...ginal-exception-in-ClassNotFound-exceptio.patch |   93 --
 ...default-FLAGS.logfile_mode-is-properly-co.patch |   49 -
 ...t-errors-on-confirm-revertResize-failures.patch |   88 --
 ...ds-ext4-and-reiserfs-to-_mount_filesystem.patch |   30 -
 0033-Improve-access-check-on-images.patch          |   82 --
 ...es-bug-834633-Auto-assigning-floating-IPs.patch |   62 -
 0035-fixes-bug-883233.patch                        |   44 -
 ...x-deletion-of-instances-without-fixed-ips.patch |  101 --
 ...njection-for-OSAPI-rebuilds.-Fixes-881649.patch |   72 -
 0038-Add-.gitreview-config-file-for-gerrit.patch   |   48 -
 ...ulk-create-fixed-ips.-The-true-issue-here.patch |   98 --
 0040-Retry-failed-SQL-connections-LP-876663.patch  |   68 -
 ...-NoAuth-to-account-for-requests-ending-in.patch |   43 -
 ...etworks-returned-from-get_instance_nw_inf.patch |   61 -
 ...ajax_console_proxy_port-needs-to-be-an-in.patch |   30 -
 ...-861160-newly-created-network-has-no-uuid.patch |   61 -
 ...yError-when-passed-unknown-format-of-time.patch |   32 -
 ...-Add-local-storage-of-context-for-logging.patch |  122 --
 ...4863-nova-logs-everything-to-syslog-twice.patch |   44 -
 ...nova-ajax-console-proxy-crashes-on-shutdo.patch |   28 -
 ...xception.KeypairNotFound-usage-correction.patch |   30 -
 0050-fix-bug-816630.patch                          |   54 -
 0051-Log-the-exception-when-we-get-one.patch       |   29 -
 0052-Change-floating-snat-to-float-snat.patch      |   46 -
 0053-Fix-for-launchpad-bug-882568.patch            |   41 -
 0054-Undefine-libvirt-saved-instances.patch        |   93 --
 ...l-dropped-exception-when-a-new-exception-.patch |   95 --
 ...Fix-exception-reraising-in-volume-manager.patch |   78 -
 ...e-run-instances-respect-availability-zone.patch |   78 -
 ...kes-rpc_allocate_fixed_ip-return-properly.patch |   74 -
 ...ption.wrap_exception-so-that-all-exceptio.patch |   65 -
 0060-Move-failed-instances-to-error-state.patch    |  186 ---
 0061-Fixes-LP878319.patch                          |  152 --
 0062-Fixes-bug-871877.patch                        |   76 -
 ...-exit-with-status-1-if-an-image-registrat.patch |   32 -
 ...-notification-bug-when-creating-instances.patch |   56 -
 0065-fix-rebuild-sha1-not-string-error.patch       |   61 -
 0066-Verify-security-group-parameters.patch        |  307 ----
 ...Faults-raised-by-OpenStack-API-Resource-h.patch |   35 -
 0068-Makes-sure-gateways-forward-properly.patch    |  111 --
 0069-Fix-a-minor-memory-leak.patch                 |   31 -
 0070-Fixes-bug-886263.patch                        |   30 -
 0071-Fix-for-bug-894431.patch                      |   30 -
 ...nova-actions-fails-with-HTTP-400-TypeErro.patch |  119 --
 ...ic-of-throwing-exception-if-no-floating-i.patch |   80 -
 ...esponses-to-allow-None-response-correctly.patch |  322 -----
 ...Sanitize-EC2-manifests-and-image-tarballs.patch |  122 --
 0076-Rename-.nova-venv-to-.venv.patch              |  110 --
 0077-Fix-issue-in-test_s3_malicious_tarballs.patch |   29 -
 0078-Fixes-bug-888649.patch                        |   91 --
 0079-Fixes-bug-767947.patch                        |   72 -
 ...-Add-Support-to-delete-VMs-in-error-state.patch |   27 -
 ...x-to-correctly-report-memory-on-Linux-3.X.patch |   38 -
 ...avoid-error-and-trace-on-dom.vcpus-in-lxc.patch |   35 -
 0083-Bug-751229-Floating-address-range-fixed.patch |   43 -
 ...bin-nova-manage.py-VpnCommands.spawn-call.patch |   47 -
 0085-Pass-r-option-to-collie-cluster-status.patch  |   47 -
 0086-Fixing-snapshot-failure-task_state.patch      |   73 -
 ...-overwrite-project_id-from-request-params.patch | 1505 --------------------
 openstack-nova.spec                                |  213 +---
 sources                                            |    2 +-
 100 files changed, 36 insertions(+), 9022 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d161afe..6ee45db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/nova-2011.3~d4.tar.gz
-/nova-2011.3.tar.gz
+/nova-2011.3.1~20120117.10814.tar.gz
diff --git a/0087-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch b/0001-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
similarity index 95%
rename from 0087-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
rename to 0001-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
index 24d5a17..feed969 100644
--- a/0087-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
+++ b/0001-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
@@ -1,4 +1,4 @@
-From de13d079a18c87cdaa9359ca0f02df3543db60bb Mon Sep 17 00:00:00 2001
+From 47f04fbc4ca9afc7b983a5f8049e0a979a8dbff9 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 5 Sep 2011 07:10:52 +0100
 Subject: [PATCH] Add INPUT chain rule for EC2 metadata requests (lp:856385)
diff --git a/0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch b/0002-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
similarity index 98%
rename from 0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
rename to 0002-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
index 7a79863..bad6737 100644
--- a/0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
+++ b/0002-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
@@ -1,4 +1,4 @@
-From 3ddbd984e5eed77ab269a9e10f06cee88203a9e2 Mon Sep 17 00:00:00 2001
+From 97f7fb494176135272bdd8a7f158732c2fa45409 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 8 Sep 2011 14:29:49 +0100
 Subject: [PATCH] Have nova-api add the INPUT rule for EC2 metadata
@@ -108,7 +108,7 @@ index df43f54..2ad8452 100755
  
  
 diff --git a/nova/network/manager.py b/nova/network/manager.py
-index b0befab..562401b 100644
+index 3e89fc4..c96e5b0 100644
 --- a/nova/network/manager.py
 +++ b/nova/network/manager.py
 @@ -96,8 +96,6 @@ flags.DEFINE_string('fixed_range_v6', 'fd00::/48', 'Fixed IPv6 address block')
diff --git a/0089-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch b/0003-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
similarity index 99%
rename from 0089-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
rename to 0003-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
index f2cca0e..3d57ad4 100644
--- a/0089-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
+++ b/0003-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
@@ -1,4 +1,4 @@
-From 199969c24384c88fabc3603b7328aa932826e570 Mon Sep 17 00:00:00 2001
+From 47de2a993542638fe1d0479238cd30901888e738 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 11 Aug 2011 07:44:38 -0400
 Subject: [PATCH] Allow the user to choose either ietadm or tgtadm (lp:819997)
diff --git a/0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch b/0004-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
similarity index 99%
rename from 0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
rename to 0004-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
index 7f4117b..12c2589 100644
--- a/0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
+++ b/0004-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
@@ -1,4 +1,4 @@
-From 8fc8b08654097bc80b4790e7d58ad63822b12b63 Mon Sep 17 00:00:00 2001
+From 0c09b416d34bcd37e4bc6fa55b15180e0b5711f3 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Sun, 18 Sep 2011 12:04:46 +0100
 Subject: [PATCH] Remove VolumeDriver.sync_exec method (lp:819997)
diff --git a/0091-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch b/0005-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
similarity index 99%
rename from 0091-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
rename to 0005-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
index 3651686..8241503 100644
--- a/0091-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
+++ b/0005-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
@@ -1,4 +1,4 @@
-From 4260879ccb158a64911a48362b546a2b53f7cf23 Mon Sep 17 00:00:00 2001
+From b79a50d5d6922a174f7ca1a767b822c8cb3ca83d Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Sun, 18 Sep 2011 16:02:43 +0100
 Subject: [PATCH] Refactor ietadm/tgtadm calls out into helper classes
diff --git a/0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch b/0006-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
similarity index 95%
rename from 0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
rename to 0006-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
index c69e0b6..e87ec67 100644
--- a/0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
+++ b/0006-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
@@ -1,4 +1,4 @@
-From 224073ac93267e5117c6e4e60610e75a36777e5e Mon Sep 17 00:00:00 2001
+From 36b2cf2443eb570920d08c282213ccf54586519a Mon Sep 17 00:00:00 2001
 From: Chuck Short <chuck.short at canonical.com>
 Date: Tue, 13 Dec 2011 13:45:43 -0500
 Subject: [PATCH] Fix tgtadm off by one error. Fixes bug #871278
diff --git a/0093-Bug-898257-abstract-out-disk-image-access-methods.patch b/0007-Bug-898257-abstract-out-disk-image-access-methods.patch
similarity index 99%
rename from 0093-Bug-898257-abstract-out-disk-image-access-methods.patch
rename to 0007-Bug-898257-abstract-out-disk-image-access-methods.patch
index b7c3b44..ee595e4 100644
--- a/0093-Bug-898257-abstract-out-disk-image-access-methods.patch
+++ b/0007-Bug-898257-abstract-out-disk-image-access-methods.patch
@@ -1,4 +1,4 @@
-From df4e5ff5e959b37e8fa30b9830a53a47aa650eda Mon Sep 17 00:00:00 2001
+From 4083639c0aa0b898b9a9443b5c1ad13d50d51f80 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Wed, 30 Nov 2011 17:00:17 +0000
 Subject: [PATCH] Bug#898257 abstract out disk image access methods
diff --git a/0094-Bug-898257-support-handling-images-with-libguestfs.patch b/0008-Bug-898257-support-handling-images-with-libguestfs.patch
similarity index 98%
rename from 0094-Bug-898257-support-handling-images-with-libguestfs.patch
rename to 0008-Bug-898257-support-handling-images-with-libguestfs.patch
index dea1ba7..133b7df 100644
--- a/0094-Bug-898257-support-handling-images-with-libguestfs.patch
+++ b/0008-Bug-898257-support-handling-images-with-libguestfs.patch
@@ -1,4 +1,4 @@
-From cd01dc63868c61ebdc209c574fa67825d32ad98a Mon Sep 17 00:00:00 2001
+From b9febc6293c423edb7744162566548c462cf0db1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Wed, 30 Nov 2011 17:00:17 +0000
 Subject: [PATCH] Bug#898257 support handling images with libguestfs
diff --git a/0096-Fix-libguestfs-operation-with-specified-partitions.patch b/0009-Fix-libguestfs-operation-with-specified-partitions.patch
similarity index 91%
rename from 0096-Fix-libguestfs-operation-with-specified-partitions.patch
rename to 0009-Fix-libguestfs-operation-with-specified-partitions.patch
index 76261f9..34763f7 100644
--- a/0096-Fix-libguestfs-operation-with-specified-partitions.patch
+++ b/0009-Fix-libguestfs-operation-with-specified-partitions.patch
@@ -1,5 +1,5 @@
-From e988f431d86660318b46729dea6e772083f2248d Mon Sep 17 00:00:00 2001
-From: =?utf8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
+From a7d3b295dc3468a3a7c9b256434dc9e6fa2becdb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Tue, 10 Jan 2012 10:54:21 +0000
 Subject: [PATCH] Fix libguestfs operation with specified partitions
 
@@ -39,5 +39,5 @@ index 6323dc8..20e3eda 100644
              # We don't resort to -i for this case yet,
              # as some older versions of libguestfs
 -- 
-1.7.4.1
+1.7.6.5
 
diff --git a/0095-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0010-Ensure-we-don-t-access-the-net-when-building-docs.patch
similarity index 94%
rename from 0095-Ensure-we-don-t-access-the-net-when-building-docs.patch
rename to 0010-Ensure-we-don-t-access-the-net-when-building-docs.patch
index ce39971..d16a5a7 100644
--- a/0095-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0010-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,4 +1,4 @@
-From b5a1727b4dc5ee96e8608c7496044fad00603f9f Mon Sep 17 00:00:00 2001
+From 2dfbdaf61503bca6f0acbe76343f5375944850f2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <pbrady at redhat.com>
 Date: Fri, 6 Jan 2012 12:16:34 +0000
 Subject: [PATCH] Ensure we don't access the net when building docs
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 03b396d..40d2a22 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -1,14 +1,17 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
+%global revno 10814
+%global snapshot ~20120117.%{revno}
+
 Name:             openstack-nova
-Version:          2011.3
-Release:          19%{?dist}
+Version:          2011.3.1
+Release:          0.1.%{revno}%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://openstack.org/projects/compute/
-Source0:          http://launchpad.net/nova/diablo/2011.3/+download/nova-%{version}.tar.gz
+Source0:          http://launchpad.net/nova/diablo/2011.3/+download/nova-%{version}%{snapshot}.tar.gz
 Source1:          nova.conf
 Source6:          nova.logrotate
 
@@ -30,114 +33,27 @@ Source23:         openstack-nova-db-setup
 #
 # Patches managed here: https://github.com/markmc/nova/tree/fedora-patches
 #
-#   $> git format-patch -N 2011.3
+#   $> git format-patch -N 2011.3.1-20120117.10814
 #   $> for p in 00*.patch; do filterdiff -x '*/.gitignore' -x '*/.mailmap' $p | sponge $p; done
 #   $> for p in 00*.patch; do echo "Patch${p:2:2}:          $p"; done
 #   $> for p in 00*.patch; do echo "%patch${p:2:2} -p1"; done
 #
 
 # These are from stable/diablo
-Patch01:          0001-Add-tools-rfc.sh-from-master.patch
-Patch02:          0002-Don-t-use-GitPython-for-authors-check.patch
-Patch03:          0003-Made-jenkins-email-pruning-more-resilient.patch
-Patch04:          0004-Removing-old-code-that-snuck-back-in.patch
-Patch05:          0005-Fix-outstanding-pep8-errors-for-a-clean-trunk.patch
-Patch06:          0006-Point-tools-rfc.sh-at-the-right-branch.patch
-Patch07:          0007-Makes-sure-to-recreate-gateway-for-moved-ip.patch
-Patch08:          0008-put-fully-qualified-domain-name-in-local-hostname.patch
-Patch09:          0009-Fix-the-grantee-group-loading-for-source-groups.patch
-Patch10:          0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch
-Patch11:          0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch
-Patch12:          0012-Raise-InsufficientFreeMemory.patch
-Patch13:          0013-Don-t-leak-exceptions-out-to-users.patch
-Patch14:          0014-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
-Patch15:          0015-Add-missing-author.patch
-Patch16:          0016-Make-snapshots-private-by-default.patch
-Patch17:          0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
-Patch18:          0018-Fixed-bug-lp850602.patch
-Patch19:          0019-bug-861310.patch
-Patch20:          0020-Enforce-snapshot-cleanup.patch
-Patch21:          0021-bug-lp845714.patch
-Patch22:          0022-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
-Patch23:          0023-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
-Patch24:          0024-Fixes-bug-862633-OS-api-consoles-create-broken.patch
-Patch25:          0025-Deallocate-ip-if-build-fails.patch
-Patch26:          0026-Stop-returning-correct-password-on-api-calls.patch
-Patch27:          0027-Handle-pidfile-exception-for-dnsmasq.patch
-Patch28:          0028-Make-sure-unknown-extensions-return-404.patch
-Patch29:          0029-Include-original-exception-in-ClassNotFound-exceptio.patch
-Patch30:          0030-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
-Patch31:          0031-Explicit-errors-on-confirm-revertResize-failures.patch
-Patch32:          0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch
-Patch33:          0033-Improve-access-check-on-images.patch
-Patch34:          0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch
-Patch35:          0035-fixes-bug-883233.patch
-Patch36:          0036-Fix-deletion-of-instances-without-fixed-ips.patch
-Patch37:          0037-Fix-file-injection-for-OSAPI-rebuilds.-Fixes-881649.patch
-Patch38:          0038-Add-.gitreview-config-file-for-gerrit.patch
-Patch39:          0039-Adding-bulk-create-fixed-ips.-The-true-issue-here.patch
-Patch40:          0040-Retry-failed-SQL-connections-LP-876663.patch
-Patch41:          0041-Updated-NoAuth-to-account-for-requests-ending-in.patch
-Patch42:          0042-Make-sure-networks-returned-from-get_instance_nw_inf.patch
-Patch43:          0043-Bug-884527-ajax_console_proxy_port-needs-to-be-an-in.patch
-Patch44:          0044-Fix-lp-861160-newly-created-network-has-no-uuid.patch
-Patch45:          0045-Fix-KeyError-when-passed-unknown-format-of-time.patch
-Patch46:          0046-Add-local-storage-of-context-for-logging.patch
-Patch47:          0047-Bug-884863-nova-logs-everything-to-syslog-twice.patch
-Patch48:          0048-Bug-884534-nova-ajax-console-proxy-crashes-on-shutdo.patch
-Patch49:          0049-exception.KeypairNotFound-usage-correction.patch
-Patch50:          0050-fix-bug-816630.patch
-Patch51:          0051-Log-the-exception-when-we-get-one.patch
-Patch52:          0052-Change-floating-snat-to-float-snat.patch
-Patch53:          0053-Fix-for-launchpad-bug-882568.patch
-Patch54:          0054-Undefine-libvirt-saved-instances.patch
-Patch55:          0055-Log-original-dropped-exception-when-a-new-exception-.patch
-Patch56:          0056-Fix-exception-reraising-in-volume-manager.patch
-Patch57:          0057-Make-run-instances-respect-availability-zone.patch
-Patch58:          0058-Makes-rpc_allocate_fixed_ip-return-properly.patch
-Patch59:          0059-Update-exception.wrap_exception-so-that-all-exceptio.patch
-Patch60:          0060-Move-failed-instances-to-error-state.patch
-Patch61:          0061-Fixes-LP878319.patch
-Patch62:          0062-Fixes-bug-871877.patch
-Patch63:          0063-nova-manage-exit-with-status-1-if-an-image-registrat.patch
-Patch64:          0064-Fix-a-notification-bug-when-creating-instances.patch
-Patch65:          0065-fix-rebuild-sha1-not-string-error.patch
-Patch66:          0066-Verify-security-group-parameters.patch
-Patch67:          0067-Bug-886353-Faults-raised-by-OpenStack-API-Resource-h.patch
-Patch68:          0068-Makes-sure-gateways-forward-properly.patch
-Patch69:          0069-Fix-a-minor-memory-leak.patch
-Patch70:          0070-Fixes-bug-886263.patch
-Patch71:          0071-Fix-for-bug-894431.patch
-Patch72:          0072-Bug-897091-nova-actions-fails-with-HTTP-400-TypeErro.patch
-Patch73:          0073-removed-logic-of-throwing-exception-if-no-floating-i.patch
-Patch74:          0074-Fix-RPC-responses-to-allow-None-response-correctly.patch
-Patch75:          0075-Sanitize-EC2-manifests-and-image-tarballs.patch
-Patch76:          0076-Rename-.nova-venv-to-.venv.patch
-Patch77:          0077-Fix-issue-in-test_s3_malicious_tarballs.patch
-Patch78:          0078-Fixes-bug-888649.patch
-Patch79:          0079-Fixes-bug-767947.patch
-Patch80:          0080-Add-Support-to-delete-VMs-in-error-state.patch
-Patch81:          0081-Fix-to-correctly-report-memory-on-Linux-3.X.patch
-Patch82:          0082-avoid-error-and-trace-on-dom.vcpus-in-lxc.patch
-Patch83:          0083-Bug-751229-Floating-address-range-fixed.patch
-Patch84:          0084-Bug-820059-bin-nova-manage.py-VpnCommands.spawn-call.patch
-Patch85:          0085-Pass-r-option-to-collie-cluster-status.patch
-Patch86:          0086-Fixing-snapshot-failure-task_state.patch
-Patch97:          0097-Do-not-overwrite-project_id-from-request-params.patch
 
 # These are Fedora specific backports from master
-Patch87:          0087-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
-Patch88:          0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
-Patch89:          0089-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
-Patch90:          0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
-Patch91:          0091-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
-Patch92:          0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
-Patch93:          0093-Bug-898257-abstract-out-disk-image-access-methods.patch
-Patch94:          0094-Bug-898257-support-handling-images-with-libguestfs.patch
-Patch96:          0096-Fix-libguestfs-operation-with-specified-partitions.patch
+Patch01:          0001-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
+Patch02:          0002-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
+Patch03:          0003-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
+Patch04:          0004-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
+Patch05:          0005-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
+Patch06:          0006-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
+Patch07:          0007-Bug-898257-abstract-out-disk-image-access-methods.patch
+Patch08:          0008-Bug-898257-support-handling-images-with-libguestfs.patch
+Patch09:          0009-Fix-libguestfs-operation-with-specified-partitions.patch
 
 # This is Fedora specific and not upstream
-Patch95:          0095-Ensure-we-don-t-access-the-net-when-building-docs.patch
+Patch10:          0010-Ensure-we-don-t-access-the-net-when-building-docs.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -268,10 +184,6 @@ This package contains documentation files for nova.
 %prep
 %setup -q -n nova-%{version}
 
-# Replicate screwup during git->bzr switch
-%patch04 -p1 -R
-
-# Now apply the patches from git
 %patch01 -p1
 %patch02 -p1
 %patch03 -p1
@@ -282,93 +194,6 @@ This package contains documentation files for nova.
 %patch08 -p1
 %patch09 -p1
 %patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
-%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
-%patch47 -p1
-%patch48 -p1
-%patch49 -p1
-%patch50 -p1
-%patch51 -p1
-%patch52 -p1
-%patch53 -p1
-%patch54 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
-%patch58 -p1
-%patch59 -p1
-%patch60 -p1
-%patch61 -p1
-%patch62 -p1
-%patch63 -p1
-%patch64 -p1
-%patch65 -p1
-%patch66 -p1
-%patch67 -p1
-%patch68 -p1
-%patch69 -p1
-%patch70 -p1
-%patch71 -p1
-%patch72 -p1
-%patch73 -p1
-%patch74 -p1
-%patch75 -p1
-%patch76 -p1
-%patch77 -p1
-%patch78 -p1
-%patch79 -p1
-%patch80 -p1
-%patch81 -p1
-%patch82 -p1
-%patch83 -p1
-%patch84 -p1
-%patch85 -p1
-%patch86 -p1
-%patch87 -p1
-%patch88 -p1
-%patch89 -p1
-%patch90 -p1
-%patch91 -p1
-%patch92 -p1
-%patch93 -p1
-%patch94 -p1
-%patch95 -p1
-%patch96 -p1
-%patch97 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete
 
@@ -555,6 +380,10 @@ fi
 %endif
 
 %changelog
+* Tue Jan 17 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3.1-0.1.10814
+- Update to 2011.3.1 release candidate
+- Only adds 4 patches from upstream which we didn't already have
+
 * Wed Jan 11 2012 Pádraig Brady <P at draigBrady.com> - 2011.3-19
 - Fix libguestfs support for specified partitions
 - Fix tenant bypass by authenticated users using API (#772202, CVE-2012-0030)
diff --git a/sources b/sources
index 41616db..5a1424d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb2abcf1f7b8e4b8bf2416976f23b776  nova-2011.3.tar.gz
+0ab65f95e6111c36b292a850920705a3  nova-2011.3.1~20120117.10814.tar.gz


More information about the scm-commits mailing list