[openstack-nova] Backport tgtadm off-by-one fix from upstream (#752709)
Mark McLoughlin
markmc at fedoraproject.org
Fri Jan 6 13:46:47 UTC 2012
commit 3868e78f2078720fa8ad30f7d211486a794c7730
Author: Mark McLoughlin <markmc at redhat.com>
Date: Fri Jan 6 13:08:47 2012 +0000
Backport tgtadm off-by-one fix from upstream (#752709)
0001-Add-tools-rfc.sh-from-master.patch | 2 +-
0002-Don-t-use-GitPython-for-authors-check.patch | 2 +-
...Made-jenkins-email-pruning-more-resilient.patch | 2 +-
0004-Removing-old-code-that-snuck-back-in.patch | 2 +-
...outstanding-pep8-errors-for-a-clean-trunk.patch | 2 +-
0006-Point-tools-rfc.sh-at-the-right-branch.patch | 2 +-
...kes-sure-to-recreate-gateway-for-moved-ip.patch | 2 +-
...y-qualified-domain-name-in-local-hostname.patch | 2 +-
...e-grantee-group-loading-for-source-groups.patch | 2 +-
...ders-when-auth_token-is-None.-Fixes-bug-8.patch | 2 +-
...pool-complexities-from-nova.db.sqlalchemy.patch | 2 +-
0012-Raise-InsufficientFreeMemory.patch | 2 +-
0013-Don-t-leak-exceptions-out-to-users.patch | 2 +-
...snapshots-work-for-amis.-Fixes-bug-873156.patch | 2 +-
0015-Add-missing-author.patch | 2 +-
0016-Make-snapshots-private-by-default.patch | 2 +-
...ackups-can-no-longer-happen-simultaneousl.patch | 2 +-
0018-Fixed-bug-lp850602.patch | 2 +-
0019-bug-861310.patch | 2 +-
0020-Enforce-snapshot-cleanup.patch | 2 +-
0021-bug-lp845714.patch | 2 +-
...-version-specifier-to-kombu-in-pip-requir.patch | 2 +-
...nant-id-to-the-create-images-response-Loc.patch | 2 +-
...-bug-862633-OS-api-consoles-create-broken.patch | 2 +-
0025-Deallocate-ip-if-build-fails.patch | 2 +-
...p-returning-correct-password-on-api-calls.patch | 2 +-
0027-Handle-pidfile-exception-for-dnsmasq.patch | 2 +-
0028-Make-sure-unknown-extensions-return-404.patch | 2 +-
...ginal-exception-in-ClassNotFound-exceptio.patch | 2 +-
...default-FLAGS.logfile_mode-is-properly-co.patch | 2 +-
...t-errors-on-confirm-revertResize-failures.patch | 2 +-
...ds-ext4-and-reiserfs-to-_mount_filesystem.patch | 2 +-
0033-Improve-access-check-on-images.patch | 2 +-
...es-bug-834633-Auto-assigning-floating-IPs.patch | 2 +-
0035-fixes-bug-883233.patch | 2 +-
...x-deletion-of-instances-without-fixed-ips.patch | 2 +-
...njection-for-OSAPI-rebuilds.-Fixes-881649.patch | 2 +-
0038-Add-.gitreview-config-file-for-gerrit.patch | 2 +-
...ulk-create-fixed-ips.-The-true-issue-here.patch | 2 +-
0040-Retry-failed-SQL-connections-LP-876663.patch | 2 +-
...-NoAuth-to-account-for-requests-ending-in.patch | 2 +-
...etworks-returned-from-get_instance_nw_inf.patch | 2 +-
...ajax_console_proxy_port-needs-to-be-an-in.patch | 2 +-
...-861160-newly-created-network-has-no-uuid.patch | 2 +-
...yError-when-passed-unknown-format-of-time.patch | 2 +-
...-Add-local-storage-of-context-for-logging.patch | 2 +-
...4863-nova-logs-everything-to-syslog-twice.patch | 2 +-
...nova-ajax-console-proxy-crashes-on-shutdo.patch | 2 +-
...xception.KeypairNotFound-usage-correction.patch | 2 +-
0050-fix-bug-816630.patch | 2 +-
0051-Log-the-exception-when-we-get-one.patch | 2 +-
0052-Change-floating-snat-to-float-snat.patch | 2 +-
0053-Fix-for-launchpad-bug-882568.patch | 2 +-
0054-Undefine-libvirt-saved-instances.patch | 2 +-
...l-dropped-exception-when-a-new-exception-.patch | 2 +-
...Fix-exception-reraising-in-volume-manager.patch | 2 +-
...e-run-instances-respect-availability-zone.patch | 2 +-
...kes-rpc_allocate_fixed_ip-return-properly.patch | 2 +-
...ption.wrap_exception-so-that-all-exceptio.patch | 2 +-
0060-Move-failed-instances-to-error-state.patch | 2 +-
0061-Fixes-LP878319.patch | 2 +-
0062-Fixes-bug-871877.patch | 2 +-
...-exit-with-status-1-if-an-image-registrat.patch | 2 +-
...-notification-bug-when-creating-instances.patch | 2 +-
0065-fix-rebuild-sha1-not-string-error.patch | 2 +-
0066-Verify-security-group-parameters.patch | 2 +-
...Faults-raised-by-OpenStack-API-Resource-h.patch | 2 +-
0068-Makes-sure-gateways-forward-properly.patch | 2 +-
0069-Fix-a-minor-memory-leak.patch | 2 +-
0070-Fixes-bug-886263.patch | 2 +-
0071-Fix-for-bug-894431.patch | 2 +-
...nova-actions-fails-with-HTTP-400-TypeErro.patch | 2 +-
...ic-of-throwing-exception-if-no-floating-i.patch | 2 +-
...esponses-to-allow-None-response-correctly.patch | 2 +-
...Sanitize-EC2-manifests-and-image-tarballs.patch | 2 +-
0076-Rename-.nova-venv-to-.venv.patch | 2 +-
0077-Fix-issue-in-test_s3_malicious_tarballs.patch | 2 +-
0078-Fixes-bug-888649.patch | 2 +-
0079-Fixes-bug-767947.patch | 2 +-
...-Add-Support-to-delete-VMs-in-error-state.patch | 2 +-
...x-to-correctly-report-memory-on-Linux-3.X.patch | 2 +-
...avoid-error-and-trace-on-dom.vcpus-in-lxc.patch | 2 +-
0083-Bug-751229-Floating-address-range-fixed.patch | 2 +-
...bin-nova-manage.py-VpnCommands.spawn-call.patch | 2 +-
0085-Pass-r-option-to-collie-cluster-status.patch | 2 +-
0086-Fixing-snapshot-failure-task_state.patch | 2 +-
...hain-rule-for-EC2-metadata-requests-lp-85.patch | 2 +-
...pi-add-the-INPUT-rule-for-EC2-metadata-lp.patch | 2 +-
...ser-to-choose-either-ietadm-or-tgtadm-lp-.patch | 2 +-
...e-VolumeDriver.sync_exec-method-lp-819997.patch | 2 +-
...tadm-tgtadm-calls-out-into-helper-classes.patch | 2 +-
...tgtadm-off-by-one-error.-Fixes-bug-871278.patch | 38 ++++++++++++++++++++
...57-abstract-out-disk-image-access-methods.patch | 4 +-
...7-support-handling-images-with-libguestfs.patch | 4 +-
...e-don-t-access-the-net-when-building-docs.patch | 4 +-
openstack-nova.spec | 13 +++++--
96 files changed, 144 insertions(+), 101 deletions(-)
---
diff --git a/0001-Add-tools-rfc.sh-from-master.patch b/0001-Add-tools-rfc.sh-from-master.patch
index 00b248f..269db4a 100644
--- a/0001-Add-tools-rfc.sh-from-master.patch
+++ b/0001-Add-tools-rfc.sh-from-master.patch
@@ -1,7 +1,7 @@
From 3a63bd53aa0e37c1ba5520b4031b2d1293592263 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Wed, 12 Oct 2011 13:46:02 +0100
-Subject: [PATCH 01/94] Add tools/rfc.sh from master
+Subject: [PATCH 01/95] Add tools/rfc.sh from master
We'll be managing the diablo branch using gerrit, so we'll need this
script.
diff --git a/0002-Don-t-use-GitPython-for-authors-check.patch b/0002-Don-t-use-GitPython-for-authors-check.patch
index 6c6eb33..839eb8b 100644
--- a/0002-Don-t-use-GitPython-for-authors-check.patch
+++ b/0002-Don-t-use-GitPython-for-authors-check.patch
@@ -1,7 +1,7 @@
From ba68a78d440269ac21f16cb19b4fd3ba8949c945 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Fri, 23 Sep 2011 15:57:55 +0100
-Subject: [PATCH 02/94] Don't use GitPython for authors check
+Subject: [PATCH 02/95] Don't use GitPython for authors check
I hit this issue with an older GitPython version:
diff --git a/0003-Made-jenkins-email-pruning-more-resilient.patch b/0003-Made-jenkins-email-pruning-more-resilient.patch
index 7485897..c77c706 100644
--- a/0003-Made-jenkins-email-pruning-more-resilient.patch
+++ b/0003-Made-jenkins-email-pruning-more-resilient.patch
@@ -1,7 +1,7 @@
From 6503923b235590e363d366375f3d2747e4d516b1 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred at inaugust.com>
Date: Fri, 23 Sep 2011 17:37:29 -0400
-Subject: [PATCH 03/94] Made jenkins email pruning more resilient.
+Subject: [PATCH 03/95] Made jenkins email pruning more resilient.
(cherry picked from commit c586e4ed23846420177802c164f594e021cceea8)
diff --git a/0004-Removing-old-code-that-snuck-back-in.patch b/0004-Removing-old-code-that-snuck-back-in.patch
index 64eea30..9085dc7 100644
--- a/0004-Removing-old-code-that-snuck-back-in.patch
+++ b/0004-Removing-old-code-that-snuck-back-in.patch
@@ -1,7 +1,7 @@
From b0e855e504d2c7b5f7b50f436e43a27ec05e5a46 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon at rackspace.com>
Date: Fri, 23 Sep 2011 10:35:18 -0400
-Subject: [PATCH 04/94] Removing old code that snuck back in
+Subject: [PATCH 04/95] Removing old code that snuck back in
(cherry picked from commit 7a95f73ad7b295ddd2313152973c6da2c78fac76)
diff --git a/0005-Fix-outstanding-pep8-errors-for-a-clean-trunk.patch b/0005-Fix-outstanding-pep8-errors-for-a-clean-trunk.patch
index 3c03e02..e2f1391 100644
--- a/0005-Fix-outstanding-pep8-errors-for-a-clean-trunk.patch
+++ b/0005-Fix-outstanding-pep8-errors-for-a-clean-trunk.patch
@@ -1,7 +1,7 @@
From d6137fb2442ad1f0e675deeb33e5cc456574e7d6 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred at inaugust.com>
Date: Thu, 22 Sep 2011 18:22:42 -0400
-Subject: [PATCH 05/94] Fix outstanding pep8 errors for a clean trunk.
+Subject: [PATCH 05/95] Fix outstanding pep8 errors for a clean trunk.
Also, add an option to run_tests.sh to skip running pep8. We have a separate
job in Jenkins which runs pep8, so there's no need to spin our wheels on it
diff --git a/0006-Point-tools-rfc.sh-at-the-right-branch.patch b/0006-Point-tools-rfc.sh-at-the-right-branch.patch
index d6eb70e..908917f 100644
--- a/0006-Point-tools-rfc.sh-at-the-right-branch.patch
+++ b/0006-Point-tools-rfc.sh-at-the-right-branch.patch
@@ -1,7 +1,7 @@
From 2e8b1175e43cce67832e2c564598e6cf2efff2de Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 18 Oct 2011 21:33:07 +0100
-Subject: [PATCH 06/94] Point tools/rfc.sh at the right branch
+Subject: [PATCH 06/95] Point tools/rfc.sh at the right branch
Change-Id: I9c4ed40015ea658530206c3c0d0aad70605cd5fe
---
diff --git a/0007-Makes-sure-to-recreate-gateway-for-moved-ip.patch b/0007-Makes-sure-to-recreate-gateway-for-moved-ip.patch
index 70baee2..a19e746 100644
--- a/0007-Makes-sure-to-recreate-gateway-for-moved-ip.patch
+++ b/0007-Makes-sure-to-recreate-gateway-for-moved-ip.patch
@@ -1,7 +1,7 @@
From 1c8fedc82c4b388b0a3a876a54c7f14d3c2a8342 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Mon, 26 Sep 2011 05:14:39 -0700
-Subject: [PATCH 07/94] Makes sure to recreate gateway for moved ip
+Subject: [PATCH 07/95] Makes sure to recreate gateway for moved ip
If nova moves an ip when setting up dhcp, make sure to reset
the default gateway. Fixes bug 859587
diff --git a/0008-put-fully-qualified-domain-name-in-local-hostname.patch b/0008-put-fully-qualified-domain-name-in-local-hostname.patch
index b20c422..da26f3d 100644
--- a/0008-put-fully-qualified-domain-name-in-local-hostname.patch
+++ b/0008-put-fully-qualified-domain-name-in-local-hostname.patch
@@ -1,7 +1,7 @@
From 44a2a648e7c26e3721e5ee6e28a0104458bceba3 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser at ubuntu.com>
Date: Fri, 23 Sep 2011 16:44:44 -0400
-Subject: [PATCH 08/94] put fully qualified domain name in local-hostname
+Subject: [PATCH 08/95] put fully qualified domain name in local-hostname
make metadata service return fully qualified domain name (fqdn) in
the local-hostname field. (bug 854614)
diff --git a/0009-Fix-the-grantee-group-loading-for-source-groups.patch b/0009-Fix-the-grantee-group-loading-for-source-groups.patch
index 1289930..ca7f293 100644
--- a/0009-Fix-the-grantee-group-loading-for-source-groups.patch
+++ b/0009-Fix-the-grantee-group-loading-for-source-groups.patch
@@ -1,7 +1,7 @@
From 1f6b213d92e71de1eb669e9fb869d564066dadf5 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Mon, 26 Sep 2011 08:34:14 -0700
-Subject: [PATCH 09/94] Fix the grantee group loading for source groups
+Subject: [PATCH 09/95] Fix the grantee group loading for source groups
Fixes bug 859679.
diff --git a/0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch b/0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch
index d64f1b0..1847f03 100644
--- a/0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch
+++ b/0010-Call-endheaders-when-auth_token-is-None.-Fixes-bug-8.patch
@@ -1,7 +1,7 @@
From 2754749c3767b7ddd90957b528828e235e25ccab Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince at rackspace.com>
Date: Mon, 26 Sep 2011 13:39:14 -0400
-Subject: [PATCH 10/94] Call endheaders when auth_token is None. Fixes bug
+Subject: [PATCH 10/95] Call endheaders when auth_token is None. Fixes bug
856721.
(cherry picked from commit 14eb9c6ec9c82c9f56cde5279aebb1e5a8fac4f4)
diff --git a/0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch b/0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch
index dfca0b8..484b43c 100644
--- a/0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch
+++ b/0011-Removed-db_pool-complexities-from-nova.db.sqlalchemy.patch
@@ -1,7 +1,7 @@
From 1a5e3e0c4cc2a3bf55331d46f702b980af1fbf97 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar at rackspace.com>
Date: Mon, 26 Sep 2011 11:52:21 -0400
-Subject: [PATCH 11/94] Removed db_pool complexities from
+Subject: [PATCH 11/95] Removed db_pool complexities from
nova.db.sqlalchemy.session. Fixes bug 838581.
(cherry picked from commit f3dd56e916232e38e74d9e2f24ce9a738cac63cf)
diff --git a/0012-Raise-InsufficientFreeMemory.patch b/0012-Raise-InsufficientFreeMemory.patch
index 4f9974b..1b0f9c4 100644
--- a/0012-Raise-InsufficientFreeMemory.patch
+++ b/0012-Raise-InsufficientFreeMemory.patch
@@ -1,7 +1,7 @@
From 410a8df435fb424105872dc0a39f68eed902fbf2 Mon Sep 17 00:00:00 2001
From: Aaron Lee <aaron.lee at rackspace.com>
Date: Mon, 26 Sep 2011 18:22:03 -0500
-Subject: [PATCH 12/94] Raise InsufficientFreeMemory
+Subject: [PATCH 12/95] Raise InsufficientFreeMemory
Kind of fixes bug 851374 & bug 858679
diff --git a/0013-Don-t-leak-exceptions-out-to-users.patch b/0013-Don-t-leak-exceptions-out-to-users.patch
index ba7c3de..463e396 100644
--- a/0013-Don-t-leak-exceptions-out-to-users.patch
+++ b/0013-Don-t-leak-exceptions-out-to-users.patch
@@ -1,7 +1,7 @@
From 03c9f40f1d7be54e62b129edf41a3c729049ce0c Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt at rackspace.com>
Date: Tue, 18 Oct 2011 22:08:49 +0000
-Subject: [PATCH 13/94] Don't leak exceptions out to users
+Subject: [PATCH 13/95] Don't leak exceptions out to users
Fixed bug 874472
diff --git a/0014-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch b/0014-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
index 67947d8..1db6ef7 100644
--- a/0014-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
+++ b/0014-Makes-snapshots-work-for-amis.-Fixes-bug-873156.patch
@@ -1,7 +1,7 @@
From d46f6e095b43fc00099d87f73b098a137830b167 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Fri, 14 Oct 2011 10:06:00 -0700
-Subject: [PATCH 14/94] Makes snapshots work for amis. Fixes bug 873156
+Subject: [PATCH 14/95] Makes snapshots work for amis. Fixes bug 873156
(cherry picked from commit b931d51ce47203ee6a4433dc7577e0779ab94710)
diff --git a/0015-Add-missing-author.patch b/0015-Add-missing-author.patch
index bdf4308..df6dd0f 100644
--- a/0015-Add-missing-author.patch
+++ b/0015-Add-missing-author.patch
@@ -1,7 +1,7 @@
From 26434ef46761b6e1303f394c32031057b7fec4fd Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Tue, 25 Oct 2011 06:19:27 +0100
-Subject: [PATCH 15/94] Add missing author
+Subject: [PATCH 15/95] Add missing author
Add Aaron Lee to Authors for the previous patch which somehow got
past Jenkins.
diff --git a/0016-Make-snapshots-private-by-default.patch b/0016-Make-snapshots-private-by-default.patch
index 251d599..f051610 100644
--- a/0016-Make-snapshots-private-by-default.patch
+++ b/0016-Make-snapshots-private-by-default.patch
@@ -1,7 +1,7 @@
From 5d4b9111caa80258d1aff4b68d9524915d711838 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt at rackspace.com>
Date: Wed, 28 Sep 2011 02:53:58 +0000
-Subject: [PATCH 16/94] Make snapshots private by default
+Subject: [PATCH 16/95] Make snapshots private by default
Fixes bug 850389
diff --git a/0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch b/0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
index 87e95e6..f575e17 100644
--- a/0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
+++ b/0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
@@ -1,7 +1,7 @@
From 852b9307ac86b20cbe870aa5bbfaf121226f5440 Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar at rackspace.com>
Date: Mon, 26 Sep 2011 23:41:28 -0400
-Subject: [PATCH 17/94] Snapshots/backups can no longer happen simultaneously.
+Subject: [PATCH 17/95] Snapshots/backups can no longer happen simultaneously.
Tests included.
Implemented exception.InstanceBusy when attempting to snapshot/backup an
diff --git a/0018-Fixed-bug-lp850602.patch b/0018-Fixed-bug-lp850602.patch
index 85b3c4e..6dd889e 100644
--- a/0018-Fixed-bug-lp850602.patch
+++ b/0018-Fixed-bug-lp850602.patch
@@ -1,7 +1,7 @@
From 744a0d8e7aa2c16fe55098c96cf9e46984838a4f Mon Sep 17 00:00:00 2001
From: Kei Masumoto <masumotok at nttdata.co.jp>
Date: Wed, 28 Sep 2011 15:05:54 -0400
-Subject: [PATCH 18/94] Fixed bug lp850602. Adding backing file copy operation
+Subject: [PATCH 18/95] Fixed bug lp850602. Adding backing file copy operation
on kvm block migration.
(cherry picked from commit b9aac1181581b9036c98f5aa493731fdc74be7e1)
diff --git a/0019-bug-861310.patch b/0019-bug-861310.patch
index c44709c..5ef2c1a 100644
--- a/0019-bug-861310.patch
+++ b/0019-bug-861310.patch
@@ -1,7 +1,7 @@
From 1def4abeeb6e03ad82906aaa6975c753d1649747 Mon Sep 17 00:00:00 2001
From: Sateesh Chodapuneedi <sateesh.chodapuneedi at citrix.com>
Date: Wed, 28 Sep 2011 18:07:22 +0530
-Subject: [PATCH 19/94] bug 861310
+Subject: [PATCH 19/95] bug 861310
Check if host list is not empty before trying to weigh the hosts.
diff --git a/0020-Enforce-snapshot-cleanup.patch b/0020-Enforce-snapshot-cleanup.patch
index aa139e3..213ebc8 100644
--- a/0020-Enforce-snapshot-cleanup.patch
+++ b/0020-Enforce-snapshot-cleanup.patch
@@ -1,7 +1,7 @@
From 5ff8e1cfa1b0ea22d7113b6d9fa729c8f43f1a19 Mon Sep 17 00:00:00 2001
From: David Subiros <david.perez5 at hp.com>
Date: Wed, 28 Sep 2011 15:19:04 +0100
-Subject: [PATCH 20/94] Enforce snapshot cleanup.
+Subject: [PATCH 20/95] Enforce snapshot cleanup.
Makes sure that the snapshot and the temporary directory is cleaned up,
even if qemu-img fails. Fixes bug 861582.
diff --git a/0021-bug-lp845714.patch b/0021-bug-lp845714.patch
index 1cbd362..922a5fb 100644
--- a/0021-bug-lp845714.patch
+++ b/0021-bug-lp845714.patch
@@ -1,7 +1,7 @@
From 45b48835d8edb4c6caa597eb05c959b394434f92 Mon Sep 17 00:00:00 2001
From: Aaron Lee <aaron.lee at rackspace.com>
Date: Thu, 22 Sep 2011 17:07:27 -0500
-Subject: [PATCH 21/94] bug lp845714
+Subject: [PATCH 21/95] bug lp845714
Kind of fixes it, this calls resize on the instance. The space will be
available, but the partition won't be resized to use this space.
diff --git a/0022-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch b/0022-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
index 5181d4a..5fb5986 100644
--- a/0022-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
+++ b/0022-Added-1.0.4-version-specifier-to-kombu-in-pip-requir.patch
@@ -1,7 +1,7 @@
From 74ce079c65b4283de58d46cf63943db2860a06fe Mon Sep 17 00:00:00 2001
From: Brian Lamar <brian.lamar at rackspace.com>
Date: Thu, 29 Sep 2011 15:55:42 -0400
-Subject: [PATCH 22/94] Added ==1.0.4 version specifier to kombu in
+Subject: [PATCH 22/95] Added ==1.0.4 version specifier to kombu in
pip-requires to ensure tests pass in a clean venv.
Fixes bug 862629.
diff --git a/0023-Adds-the-tenant-id-to-the-create-images-response-Loc.patch b/0023-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
index eabb924..bfe2dfe 100644
--- a/0023-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
+++ b/0023-Adds-the-tenant-id-to-the-create-images-response-Loc.patch
@@ -1,7 +1,7 @@
From 6f96fa65aa73e7803c9ba82d7a4f3b49b310e1b7 Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade at rackspace.com>
Date: Thu, 29 Sep 2011 15:58:43 -0400
-Subject: [PATCH 23/94] Adds the tenant id to the create images response
+Subject: [PATCH 23/95] Adds the tenant id to the create images response
Location header Fixes bug 862672
(cherry picked from commit f3fb16a7935e91f8c9034d1da84a2b17cbe186f8)
diff --git a/0024-Fixes-bug-862633-OS-api-consoles-create-broken.patch b/0024-Fixes-bug-862633-OS-api-consoles-create-broken.patch
index 4196e31..af21ac7 100644
--- a/0024-Fixes-bug-862633-OS-api-consoles-create-broken.patch
+++ b/0024-Fixes-bug-862633-OS-api-consoles-create-broken.patch
@@ -1,7 +1,7 @@
From b797f1ddffe331d6663f6f53f8a823442c8c3650 Mon Sep 17 00:00:00 2001
From: Chris Behrens <cbehrens at codestud.com>
Date: Thu, 29 Sep 2011 20:54:19 +0000
-Subject: [PATCH 24/94] Fixes bug 862633 -- OS api consoles create() broken
+Subject: [PATCH 24/95] Fixes bug 862633 -- OS api consoles create() broken
Fixed and added tests for OS API consoles.py which didn't exist.
diff --git a/0025-Deallocate-ip-if-build-fails.patch b/0025-Deallocate-ip-if-build-fails.patch
index b563493..40a1fa4 100644
--- a/0025-Deallocate-ip-if-build-fails.patch
+++ b/0025-Deallocate-ip-if-build-fails.patch
@@ -1,7 +1,7 @@
From 87823bbc4940e585e9b2fa2d83d1a89d43c29275 Mon Sep 17 00:00:00 2001
From: Rick Harris <rconradharris at gmail.com>
Date: Tue, 27 Sep 2011 21:05:31 +0000
-Subject: [PATCH 25/94] Deallocate ip if build fails.
+Subject: [PATCH 25/95] Deallocate ip if build fails.
Fixes LP837687
diff --git a/0026-Stop-returning-correct-password-on-api-calls.patch b/0026-Stop-returning-correct-password-on-api-calls.patch
index 15574b8..48aabb5 100644
--- a/0026-Stop-returning-correct-password-on-api-calls.patch
+++ b/0026-Stop-returning-correct-password-on-api-calls.patch
@@ -1,7 +1,7 @@
From b1ab6da1495784ff581000018a6047fd19cf82c4 Mon Sep 17 00:00:00 2001
From: Ahmad Hassan <ahmad.hassan at hp.com>
Date: Mon, 1 Aug 2011 17:16:49 +0100
-Subject: [PATCH 26/94] Stop returning correct password on api calls
+Subject: [PATCH 26/95] Stop returning correct password on api calls
Captured invalid signature exception in authentication step, so that
the problem is not returning exception to user, revealing the real
diff --git a/0027-Handle-pidfile-exception-for-dnsmasq.patch b/0027-Handle-pidfile-exception-for-dnsmasq.patch
index 77f9c2c..e58b148 100644
--- a/0027-Handle-pidfile-exception-for-dnsmasq.patch
+++ b/0027-Handle-pidfile-exception-for-dnsmasq.patch
@@ -1,7 +1,7 @@
From ad4eef0a0b296652f8ce08d86a10dea8a40b005b Mon Sep 17 00:00:00 2001
From: Yun Shen <Yun.Shen at hp.com>
Date: Thu, 29 Sep 2011 12:09:37 +0100
-Subject: [PATCH 27/94] Handle pidfile exception for dnsmasq
+Subject: [PATCH 27/95] Handle pidfile exception for dnsmasq
Capture the exception in dnsmasq_pid_for method. If the pidfile cannot be read
for some reason, it should be treated as if it does not exist. This prevents
diff --git a/0028-Make-sure-unknown-extensions-return-404.patch b/0028-Make-sure-unknown-extensions-return-404.patch
index f80a39e..6df209f 100644
--- a/0028-Make-sure-unknown-extensions-return-404.patch
+++ b/0028-Make-sure-unknown-extensions-return-404.patch
@@ -1,7 +1,7 @@
From 0ca35753f5f5a506162fde679ae7719d5d22f8e0 Mon Sep 17 00:00:00 2001
From: Ahmad Hassan <ahmad.hassan at hp.com>
Date: Wed, 5 Oct 2011 17:02:45 +0100
-Subject: [PATCH 28/94] Make sure unknown extensions return 404
+Subject: [PATCH 28/95] Make sure unknown extensions return 404
At the moment, if an extension doens't exist and we call a show method
with wrong id then the exception is not captured. There is a need to
diff --git a/0029-Include-original-exception-in-ClassNotFound-exceptio.patch b/0029-Include-original-exception-in-ClassNotFound-exceptio.patch
index 7413a1c..3e615ac 100644
--- a/0029-Include-original-exception-in-ClassNotFound-exceptio.patch
+++ b/0029-Include-original-exception-in-ClassNotFound-exceptio.patch
@@ -1,7 +1,7 @@
From 21393e64b9524b89d373d2d303afce38919c96c2 Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien.danjou at enovance.com>
Date: Thu, 6 Oct 2011 17:15:32 +0200
-Subject: [PATCH 29/94] Include original exception in ClassNotFound exception
+Subject: [PATCH 29/95] Include original exception in ClassNotFound exception
By doing this, we allow the error messages to be more useful. When an import
of a class fails because of a missing module dependency, it would have fail
diff --git a/0030-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch b/0030-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
index 86a408d..b5f39d8 100644
--- a/0030-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
+++ b/0030-Ensure-non-default-FLAGS.logfile_mode-is-properly-co.patch
@@ -1,7 +1,7 @@
From fdcfe762a52e30e09223f4128a5f4da530aefcf9 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg at canonical.com>
Date: Thu, 29 Sep 2011 21:06:06 -0700
-Subject: [PATCH 30/94] Ensure non-default FLAGS.logfile_mode is properly
+Subject: [PATCH 30/95] Ensure non-default FLAGS.logfile_mode is properly
converted to an octet.
Fixes bug 862969.
diff --git a/0031-Explicit-errors-on-confirm-revertResize-failures.patch b/0031-Explicit-errors-on-confirm-revertResize-failures.patch
index 937d469..7255f78 100644
--- a/0031-Explicit-errors-on-confirm-revertResize-failures.patch
+++ b/0031-Explicit-errors-on-confirm-revertResize-failures.patch
@@ -1,7 +1,7 @@
From ec2bfe91b7bf7424eb34ad371ec25eec62cd3d24 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon at rackspace.com>
Date: Mon, 26 Sep 2011 13:57:34 -0400
-Subject: [PATCH 31/94] Explicit errors on confirm/revertResize failures
+Subject: [PATCH 31/95] Explicit errors on confirm/revertResize failures
Fixing bug 856527
diff --git a/0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch b/0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch
index 2d7324e..9b7ee64 100644
--- a/0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch
+++ b/0032-Adds-ext4-and-reiserfs-to-_mount_filesystem.patch
@@ -1,7 +1,7 @@
From c206f73d03aa487868ba2acaa3581624160d1b67 Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh at jk0.org>
Date: Thu, 20 Oct 2011 14:44:11 -0500
-Subject: [PATCH 32/94] Adds ext4 and reiserfs to _mount_filesystem().
+Subject: [PATCH 32/95] Adds ext4 and reiserfs to _mount_filesystem().
Fixes bug 870495.
diff --git a/0033-Improve-access-check-on-images.patch b/0033-Improve-access-check-on-images.patch
index 8ef13c3..ef57498 100644
--- a/0033-Improve-access-check-on-images.patch
+++ b/0033-Improve-access-check-on-images.patch
@@ -1,7 +1,7 @@
From c11659215a1cd3e551ce56f089b2682842954b04 Mon Sep 17 00:00:00 2001
From: Loganathan Parthipan <parthipan at hp.com>
Date: Thu, 29 Sep 2011 16:41:49 +0100
-Subject: [PATCH 33/94] Improve access check on images
+Subject: [PATCH 33/95] Improve access check on images
Makes sure that users can delete only their own images, snapshots.
Enable listing of all images, both private which are owned and the public
diff --git a/0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch b/0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch
index 0ee7fcb..4f94f3d 100644
--- a/0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch
+++ b/0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch
@@ -1,7 +1,7 @@
From 80d73a2df2c33212217c59783f62d74673776ebb Mon Sep 17 00:00:00 2001
From: Kiall Mac Innes <kiall at managedit.ie>
Date: Fri, 4 Nov 2011 19:43:50 +0000
-Subject: [PATCH 34/94] Fixes bug 834633 - Auto assigning floating IPs
+Subject: [PATCH 34/95] Fixes bug 834633 - Auto assigning floating IPs
Details:
diff --git a/0035-fixes-bug-883233.patch b/0035-fixes-bug-883233.patch
index c8b9840..c217842 100644
--- a/0035-fixes-bug-883233.patch
+++ b/0035-fixes-bug-883233.patch
@@ -1,7 +1,7 @@
From 476c3259b1bb7cfe647aed4ac4a523d6fadff475 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo at cloudscaling.com>
Date: Wed, 2 Nov 2011 16:21:21 -0700
-Subject: [PATCH 35/94] fixes bug 883233.
+Subject: [PATCH 35/95] fixes bug 883233.
fix typo in scheduler/driver.py assert_compute_node_has_enough_memory.
diff --git a/0036-Fix-deletion-of-instances-without-fixed-ips.patch b/0036-Fix-deletion-of-instances-without-fixed-ips.patch
index d8bfd82..ebf5fda 100644
--- a/0036-Fix-deletion-of-instances-without-fixed-ips.patch
+++ b/0036-Fix-deletion-of-instances-without-fixed-ips.patch
@@ -1,7 +1,7 @@
From 770aabb576fc9911177737b223dedd3d6de6183b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Asbj=C3=B8rn=20Sannes?= <asbjorn.sannes at interhost.no>
Date: Wed, 19 Oct 2011 22:36:03 +0200
-Subject: [PATCH 36/94] Fix deletion of instances without fixed ips.
+Subject: [PATCH 36/95] Fix deletion of instances without fixed ips.
Catch exception when there are no fixed ips for an instance when deallocating it.
diff --git a/0037-Fix-file-injection-for-OSAPI-rebuilds.-Fixes-881649.patch b/0037-Fix-file-injection-for-OSAPI-rebuilds.-Fixes-881649.patch
index 2e9afad..6283d97 100644
--- a/0037-Fix-file-injection-for-OSAPI-rebuilds.-Fixes-881649.patch
+++ b/0037-Fix-file-injection-for-OSAPI-rebuilds.-Fixes-881649.patch
@@ -1,7 +1,7 @@
From 2a09eb2d26383ac815b0ce48a4747e60e8c4ac3d Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince at rackspace.com>
Date: Tue, 25 Oct 2011 16:22:51 -0400
-Subject: [PATCH 37/94] Fix file injection for OSAPI rebuilds. Fixes 881649.
+Subject: [PATCH 37/95] Fix file injection for OSAPI rebuilds. Fixes 881649.
(cherry picked from commit 3dd04ee508e626822a50858bb8dcc05c6cacfca1)
diff --git a/0038-Add-.gitreview-config-file-for-gerrit.patch b/0038-Add-.gitreview-config-file-for-gerrit.patch
index fe726d5..16d1496 100644
--- a/0038-Add-.gitreview-config-file-for-gerrit.patch
+++ b/0038-Add-.gitreview-config-file-for-gerrit.patch
@@ -1,7 +1,7 @@
From 2e85c05390a8d4f195659e993200a3b71011c832 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <james.blair at rackspace.com>
Date: Thu, 20 Oct 2011 13:48:18 -0400
-Subject: [PATCH 38/94] Add .gitreview config file for gerrit.
+Subject: [PATCH 38/95] Add .gitreview config file for gerrit.
The CI team is developing a new tool, git-review:
diff --git a/0039-Adding-bulk-create-fixed-ips.-The-true-issue-here.patch b/0039-Adding-bulk-create-fixed-ips.-The-true-issue-here.patch
index 3c30910..66ad5df 100644
--- a/0039-Adding-bulk-create-fixed-ips.-The-true-issue-here.patch
+++ b/0039-Adding-bulk-create-fixed-ips.-The-true-issue-here.patch
@@ -1,7 +1,7 @@
From 8405b63ad8d8c5f2c7ddb4614519ca2473d741c4 Mon Sep 17 00:00:00 2001
From: Aaron Lee <aaron.lee at rackspace.com>
Date: Thu, 27 Oct 2011 17:37:34 -0500
-Subject: [PATCH 39/94] Adding bulk create fixed ips. The true issue here is
+Subject: [PATCH 39/95] Adding bulk create fixed ips. The true issue here is
the creation of IPs in the DB that are not currently
used(we are building the entire block). This fix is
just a bandaid, but it does cut ~25 seconds off of
diff --git a/0040-Retry-failed-SQL-connections-LP-876663.patch b/0040-Retry-failed-SQL-connections-LP-876663.patch
index f32a6a2..d4494ad 100644
--- a/0040-Retry-failed-SQL-connections-LP-876663.patch
+++ b/0040-Retry-failed-SQL-connections-LP-876663.patch
@@ -1,7 +1,7 @@
From b0821f257e7fb512474a0da2b9d5c24d4cbf49ae Mon Sep 17 00:00:00 2001
From: Soren Hansen <soren at linux2go.dk>
Date: Thu, 27 Oct 2011 11:46:54 +0200
-Subject: [PATCH 40/94] Retry failed SQL connections (LP #876663)
+Subject: [PATCH 40/95] Retry failed SQL connections (LP #876663)
(cherry picked from commit 6ebc0ac3248b6ec7f1a221b4dae5f326406ab614)
diff --git a/0041-Updated-NoAuth-to-account-for-requests-ending-in.patch b/0041-Updated-NoAuth-to-account-for-requests-ending-in.patch
index 8eb04cd..7cea74f 100644
--- a/0041-Updated-NoAuth-to-account-for-requests-ending-in.patch
+++ b/0041-Updated-NoAuth-to-account-for-requests-ending-in.patch
@@ -1,7 +1,7 @@
From 2aa5bb969256b5a447b37704d9a2076f2c5bf48d Mon Sep 17 00:00:00 2001
From: Alex Meade <alex.meade at rackspace.com>
Date: Fri, 28 Oct 2011 12:32:47 -0400
-Subject: [PATCH 41/94] Updated NoAuth to account for requests ending in /
+Subject: [PATCH 41/95] Updated NoAuth to account for requests ending in /
Fixes bug 882742
diff --git a/0042-Make-sure-networks-returned-from-get_instance_nw_inf.patch b/0042-Make-sure-networks-returned-from-get_instance_nw_inf.patch
index 49b22af..8fdc681 100644
--- a/0042-Make-sure-networks-returned-from-get_instance_nw_inf.patch
+++ b/0042-Make-sure-networks-returned-from-get_instance_nw_inf.patch
@@ -1,7 +1,7 @@
From 029ee3023ec258e5900ec1918c5488bcaf6e677c Mon Sep 17 00:00:00 2001
From: Brad Hall <brad at nicira.com>
Date: Mon, 3 Oct 2011 12:07:50 -0700
-Subject: [PATCH 42/94] Make sure networks returned from get_instance_nw_info
+Subject: [PATCH 42/95] Make sure networks returned from get_instance_nw_info
have a label
(cherry picked from commit 606827f92e74d8ff5ae13e3210abedd511fd4518)
diff --git a/0043-Bug-884527-ajax_console_proxy_port-needs-to-be-an-in.patch b/0043-Bug-884527-ajax_console_proxy_port-needs-to-be-an-in.patch
index f36c354..cb7b37d 100644
--- a/0043-Bug-884527-ajax_console_proxy_port-needs-to-be-an-in.patch
+++ b/0043-Bug-884527-ajax_console_proxy_port-needs-to-be-an-in.patch
@@ -1,7 +1,7 @@
From 6b5a94149cc471c277883f390c122969a2e743f5 Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor at citrix.com>
Date: Mon, 31 Oct 2011 17:21:54 -0700
-Subject: [PATCH 43/94] Bug 884527: ajax_console_proxy_port needs to be an
+Subject: [PATCH 43/95] Bug 884527: ajax_console_proxy_port needs to be an
integer
Fix declaration of ajax_console_proxy_port flag.
diff --git a/0044-Fix-lp-861160-newly-created-network-has-no-uuid.patch b/0044-Fix-lp-861160-newly-created-network-has-no-uuid.patch
index 3d1d5ed..c92eb84 100644
--- a/0044-Fix-lp-861160-newly-created-network-has-no-uuid.patch
+++ b/0044-Fix-lp-861160-newly-created-network-has-no-uuid.patch
@@ -1,7 +1,7 @@
From e632d21a88665463873787edf1a56d76103ed071 Mon Sep 17 00:00:00 2001
From: Unmesh Gurjar <unmesh.gurjar at vertex.co.in>
Date: Wed, 19 Oct 2011 14:44:01 +0530
-Subject: [PATCH 44/94] Fix lp:861160 -- newly created network has no uuid
+Subject: [PATCH 44/95] Fix lp:861160 -- newly created network has no uuid
Implemented code review changes.
Fixed issue causing pep8 build failure.
diff --git a/0045-Fix-KeyError-when-passed-unknown-format-of-time.patch b/0045-Fix-KeyError-when-passed-unknown-format-of-time.patch
index ce3f5ab..c40c456 100644
--- a/0045-Fix-KeyError-when-passed-unknown-format-of-time.patch
+++ b/0045-Fix-KeyError-when-passed-unknown-format-of-time.patch
@@ -1,7 +1,7 @@
From bf439484c07944c5558fc833502164b9593a85bf Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt at rackspace.com>
Date: Tue, 1 Nov 2011 15:31:30 +0000
-Subject: [PATCH 45/94] Fix KeyError when passed unknown format of time
+Subject: [PATCH 45/95] Fix KeyError when passed unknown format of time
Fixes bug 883253
diff --git a/0046-Add-local-storage-of-context-for-logging.patch b/0046-Add-local-storage-of-context-for-logging.patch
index e548424..f76ffab 100644
--- a/0046-Add-local-storage-of-context-for-logging.patch
+++ b/0046-Add-local-storage-of-context-for-logging.patch
@@ -1,7 +1,7 @@
From 17268cab604b0712affc4c0b488769be03605571 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Fri, 21 Oct 2011 11:18:11 -0700
-Subject: [PATCH 46/94] Add local storage of context for logging
+Subject: [PATCH 46/95] Add local storage of context for logging
* adds nova/local.py:store for storing greenthread local data
* saves a weak reference to the last context object created
diff --git a/0047-Bug-884863-nova-logs-everything-to-syslog-twice.patch b/0047-Bug-884863-nova-logs-everything-to-syslog-twice.patch
index c4bf697..1009ac4 100644
--- a/0047-Bug-884863-nova-logs-everything-to-syslog-twice.patch
+++ b/0047-Bug-884863-nova-logs-everything-to-syslog-twice.patch
@@ -1,7 +1,7 @@
From a5e0dee1500a08d335621ebdc1506dad271b9130 Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor at citrix.com>
Date: Tue, 1 Nov 2011 11:54:59 -0700
-Subject: [PATCH 47/94] Bug 884863: nova logs everything to syslog twice
+Subject: [PATCH 47/95] Bug 884863: nova logs everything to syslog twice
Fix double-registration of the syslog handler.
NovaRootLogger.setup_from_flags is called twice from log.setup() -- once
diff --git a/0048-Bug-884534-nova-ajax-console-proxy-crashes-on-shutdo.patch b/0048-Bug-884534-nova-ajax-console-proxy-crashes-on-shutdo.patch
index 8813192..d951a6d 100644
--- a/0048-Bug-884534-nova-ajax-console-proxy-crashes-on-shutdo.patch
+++ b/0048-Bug-884534-nova-ajax-console-proxy-crashes-on-shutdo.patch
@@ -1,7 +1,7 @@
From 9a00aea7fc49522ab8628383e8a3fde3f0aa83db Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor at citrix.com>
Date: Mon, 31 Oct 2011 17:33:47 -0700
-Subject: [PATCH 48/94] Bug #884534: nova-ajax-console-proxy crashes on
+Subject: [PATCH 48/95] Bug #884534: nova-ajax-console-proxy crashes on
shutdown
Close the correct connection, when shutting down. self is not defined in
diff --git a/0049-exception.KeypairNotFound-usage-correction.patch b/0049-exception.KeypairNotFound-usage-correction.patch
index a616846..0c85ac8 100644
--- a/0049-exception.KeypairNotFound-usage-correction.patch
+++ b/0049-exception.KeypairNotFound-usage-correction.patch
@@ -1,7 +1,7 @@
From 81d956786f3d8c10569064fdc288637327098bd6 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon at rackspace.com>
Date: Thu, 3 Nov 2011 09:22:35 -0400
-Subject: [PATCH 49/94] exception.KeypairNotFound usage correction
+Subject: [PATCH 49/95] exception.KeypairNotFound usage correction
Fixes bug 885462
diff --git a/0050-fix-bug-816630.patch b/0050-fix-bug-816630.patch
index 5408443..df47f88 100644
--- a/0050-fix-bug-816630.patch
+++ b/0050-fix-bug-816630.patch
@@ -1,7 +1,7 @@
From be3f35b9ead65419e548ca13d5d463deb9da3a9d Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo at cloudscaling.com>
Date: Tue, 1 Nov 2011 12:22:13 -0700
-Subject: [PATCH 50/94] fix bug 816630
+Subject: [PATCH 50/95] fix bug 816630
Off by one error fixed
With test case
diff --git a/0051-Log-the-exception-when-we-get-one.patch b/0051-Log-the-exception-when-we-get-one.patch
index da7c6a5..86a6c64 100644
--- a/0051-Log-the-exception-when-we-get-one.patch
+++ b/0051-Log-the-exception-when-we-get-one.patch
@@ -1,7 +1,7 @@
From e2b450c00fd7491b09109fdc13efe02ee5765fbc Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor at citrix.com>
Date: Tue, 1 Nov 2011 11:33:44 -0700
-Subject: [PATCH 51/94] Log the exception when we get one.
+Subject: [PATCH 51/95] Log the exception when we get one.
(cherry picked from commit 46152102a0f5900e1a2cc0800ec850aa7191a3d6)
diff --git a/0052-Change-floating-snat-to-float-snat.patch b/0052-Change-floating-snat-to-float-snat.patch
index bc98329..7dee12d 100644
--- a/0052-Change-floating-snat-to-float-snat.patch
+++ b/0052-Change-floating-snat-to-float-snat.patch
@@ -1,7 +1,7 @@
From 938292fc63ab1fb36d4ac0ae1ad74ab5cff26410 Mon Sep 17 00:00:00 2001
From: Brad Hall <brad at nicira.com>
Date: Sun, 2 Oct 2011 07:13:53 -0700
-Subject: [PATCH 52/94] Change floating-snat to float-snat
+Subject: [PATCH 52/95] Change floating-snat to float-snat
With iptables v1.4.10 I'm running into an issue with the chain length of the
"nova-dhcpbridge-floating-snat" table (iptables it complaining that the name
diff --git a/0053-Fix-for-launchpad-bug-882568.patch b/0053-Fix-for-launchpad-bug-882568.patch
index 9edf5d3..46b4576 100644
--- a/0053-Fix-for-launchpad-bug-882568.patch
+++ b/0053-Fix-for-launchpad-bug-882568.patch
@@ -1,7 +1,7 @@
From 95b56105b2fc66de2c1cbaad773955a65ed30fa0 Mon Sep 17 00:00:00 2001
From: Brad Hall <brad at nicira.com>
Date: Thu, 27 Oct 2011 17:45:23 -0700
-Subject: [PATCH 53/94] Fix for launchpad bug #882568
+Subject: [PATCH 53/95] Fix for launchpad bug #882568
Use tunctl to create the tap device if we are on a system where the ip command
is too old (and doesn't have support for tuntap).
diff --git a/0054-Undefine-libvirt-saved-instances.patch b/0054-Undefine-libvirt-saved-instances.patch
index 2665c75..9980e73 100644
--- a/0054-Undefine-libvirt-saved-instances.patch
+++ b/0054-Undefine-libvirt-saved-instances.patch
@@ -1,7 +1,7 @@
From 27b0ff5ccd66eaaeda2ac2a013815c4d34cf9ec9 Mon Sep 17 00:00:00 2001
From: Derek Higgins <higginsd at gmail.com>
Date: Fri, 4 Nov 2011 00:25:34 +0000
-Subject: [PATCH 54/94] Undefine libvirt saved instances
+Subject: [PATCH 54/95] Undefine libvirt saved instances
Fixes bug 814561
diff --git a/0055-Log-original-dropped-exception-when-a-new-exception-.patch b/0055-Log-original-dropped-exception-when-a-new-exception-.patch
index 25d2156..bbcd239 100644
--- a/0055-Log-original-dropped-exception-when-a-new-exception-.patch
+++ b/0055-Log-original-dropped-exception-when-a-new-exception-.patch
@@ -1,7 +1,7 @@
From f286a4b29d4386f8fe93f9c58fe1486f859c1317 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt at rackspace.com>
Date: Mon, 31 Oct 2011 15:11:36 +0000
-Subject: [PATCH 55/94] Log original dropped exception when a new exception
+Subject: [PATCH 55/95] Log original dropped exception when a new exception
occurs
If a exception is caught while processing a previous exception, make sure
diff --git a/0056-Fix-exception-reraising-in-volume-manager.patch b/0056-Fix-exception-reraising-in-volume-manager.patch
index 4522171..a5925ba 100644
--- a/0056-Fix-exception-reraising-in-volume-manager.patch
+++ b/0056-Fix-exception-reraising-in-volume-manager.patch
@@ -1,7 +1,7 @@
From 3f0196a2cb2e708442de6f2676113e4e9417ba2b Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yorik.sar at gmail.com>
Date: Thu, 27 Oct 2011 13:57:59 +0400
-Subject: [PATCH 56/94] Fix exception reraising in volume manager.
+Subject: [PATCH 56/95] Fix exception reraising in volume manager.
Cherry-picked from ad710f2743f4671927fd72387e10527ac1778362.
diff --git a/0057-Make-run-instances-respect-availability-zone.patch b/0057-Make-run-instances-respect-availability-zone.patch
index b44a113..94f660b 100644
--- a/0057-Make-run-instances-respect-availability-zone.patch
+++ b/0057-Make-run-instances-respect-availability-zone.patch
@@ -1,7 +1,7 @@
From d0b0f76b2b90866b20c2a7cd4d230308972d512a Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Fri, 11 Nov 2011 11:37:03 -0800
-Subject: [PATCH 57/94] Make run instances respect availability zone
+Subject: [PATCH 57/95] Make run instances respect availability zone
* includes test
* fixes bug 888918
diff --git a/0058-Makes-rpc_allocate_fixed_ip-return-properly.patch b/0058-Makes-rpc_allocate_fixed_ip-return-properly.patch
index f45fce4..6dfc55c 100644
--- a/0058-Makes-rpc_allocate_fixed_ip-return-properly.patch
+++ b/0058-Makes-rpc_allocate_fixed_ip-return-properly.patch
@@ -1,7 +1,7 @@
From 1e3b88ba20b9f9ab925ecd1238845adbc0157cb1 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Mon, 28 Nov 2011 14:42:38 -0800
-Subject: [PATCH 58/94] Makes rpc_allocate_fixed_ip return properly
+Subject: [PATCH 58/95] Makes rpc_allocate_fixed_ip return properly
* Fixes bug 855030
* Includes test
diff --git a/0059-Update-exception.wrap_exception-so-that-all-exceptio.patch b/0059-Update-exception.wrap_exception-so-that-all-exceptio.patch
index c7aa6d5..d015547 100644
--- a/0059-Update-exception.wrap_exception-so-that-all-exceptio.patch
+++ b/0059-Update-exception.wrap_exception-so-that-all-exceptio.patch
@@ -1,7 +1,7 @@
From d05c2e6d33f40dac1aa373fcceb819d97d9e3467 Mon Sep 17 00:00:00 2001
From: Dan Prince <dan.prince at rackspace.com>
Date: Thu, 15 Sep 2011 22:53:42 -0400
-Subject: [PATCH 59/94] Update exception.wrap_exception so that all exceptions
+Subject: [PATCH 59/95] Update exception.wrap_exception so that all exceptions
(not just Error and NovaException types) get logged
correctly.
diff --git a/0060-Move-failed-instances-to-error-state.patch b/0060-Move-failed-instances-to-error-state.patch
index 996c269..85cafb1 100644
--- a/0060-Move-failed-instances-to-error-state.patch
+++ b/0060-Move-failed-instances-to-error-state.patch
@@ -1,7 +1,7 @@
From 094ea6bf60c1edec84571bfe2d2d17fc554608c2 Mon Sep 17 00:00:00 2001
From: Aaron Lee <aaron.lee at rackspace.com>
Date: Thu, 3 Nov 2011 15:05:30 -0500
-Subject: [PATCH 60/94] Move failed instances to error state
+Subject: [PATCH 60/95] Move failed instances to error state
On instance creation there is the possibility of
an instance raising. This would not cause the
diff --git a/0061-Fixes-LP878319.patch b/0061-Fixes-LP878319.patch
index a1b3919..2740e2f 100644
--- a/0061-Fixes-LP878319.patch
+++ b/0061-Fixes-LP878319.patch
@@ -1,7 +1,7 @@
From 5423f1a88c105ac2214e6d77d99cbc0efb582282 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jason=20K=C3=B6lker?= <jason at koelker.net>
Date: Fri, 4 Nov 2011 16:37:09 -0500
-Subject: [PATCH 61/94] Fixes LP878319
+Subject: [PATCH 61/95] Fixes LP878319
* Adds lookup of host version in XenAPI session
* Add call to determine function name of resize
diff --git a/0062-Fixes-bug-871877.patch b/0062-Fixes-bug-871877.patch
index ff5844e..e5091ce 100644
--- a/0062-Fixes-bug-871877.patch
+++ b/0062-Fixes-bug-871877.patch
@@ -1,7 +1,7 @@
From 60cb0496c25f71d748bc8634cc13c8614d970df1 Mon Sep 17 00:00:00 2001
From: Alvaro Lopez <aloga at ifca.unican.es>
Date: Wed, 9 Nov 2011 16:18:39 +0100
-Subject: [PATCH 62/94] Fixes bug 871877
+Subject: [PATCH 62/95] Fixes bug 871877
Added an aditional testunit to the VlanNetworkTestCase to check
if the FixedIpNotFoundForNetwork exception is raised properly.
diff --git a/0063-nova-manage-exit-with-status-1-if-an-image-registrat.patch b/0063-nova-manage-exit-with-status-1-if-an-image-registrat.patch
index 43d84dc..6621ce6 100644
--- a/0063-nova-manage-exit-with-status-1-if-an-image-registrat.patch
+++ b/0063-nova-manage-exit-with-status-1-if-an-image-registrat.patch
@@ -1,7 +1,7 @@
From 39fdf335961f19903f87a4d09fd49a777c9838f2 Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor at citrix.com>
Date: Wed, 9 Nov 2011 23:24:25 -0800
-Subject: [PATCH 63/94] nova-manage: exit with status 1 if an image
+Subject: [PATCH 63/95] nova-manage: exit with status 1 if an image
registration fails
This indicates the failure to the user through the exit status.
diff --git a/0064-Fix-a-notification-bug-when-creating-instances.patch b/0064-Fix-a-notification-bug-when-creating-instances.patch
index 204aaa3..8143e72 100644
--- a/0064-Fix-a-notification-bug-when-creating-instances.patch
+++ b/0064-Fix-a-notification-bug-when-creating-instances.patch
@@ -1,7 +1,7 @@
From d565f3ad5917e90ab50a4b8ae9fe5079f70ed591 Mon Sep 17 00:00:00 2001
From: "Kevin L. Mitchell" <kevin.mitchell at rackspace.com>
Date: Thu, 10 Nov 2011 17:35:44 -0600
-Subject: [PATCH 64/94] Fix a notification bug when creating instances
+Subject: [PATCH 64/95] Fix a notification bug when creating instances
Fixes a notifier bug that caused 'launched_at' to be empty and
state to be reported as 'building', due to failure to refresh
diff --git a/0065-fix-rebuild-sha1-not-string-error.patch b/0065-fix-rebuild-sha1-not-string-error.patch
index b50d554..ff725e0 100644
--- a/0065-fix-rebuild-sha1-not-string-error.patch
+++ b/0065-fix-rebuild-sha1-not-string-error.patch
@@ -1,7 +1,7 @@
From ce4ea1f35c2d73b644498f4f06b46c75abd9b08d Mon Sep 17 00:00:00 2001
From: David Subiros <david.perez5 at hp.com>
Date: Tue, 4 Oct 2011 13:12:40 +0100
-Subject: [PATCH 65/94] fix rebuild sha1 not string error
+Subject: [PATCH 65/95] fix rebuild sha1 not string error
fixes bug #889164
The sha1() parameter is converted to a string
diff --git a/0066-Verify-security-group-parameters.patch b/0066-Verify-security-group-parameters.patch
index 51aedd8..2ef4a4b 100644
--- a/0066-Verify-security-group-parameters.patch
+++ b/0066-Verify-security-group-parameters.patch
@@ -1,7 +1,7 @@
From bcf241259246179035f20649f947b99b21d7978a Mon Sep 17 00:00:00 2001
From: Ahmad Hassan <ahmad.hassan at hp.com>
Date: Fri, 30 Sep 2011 15:10:33 +0100
-Subject: [PATCH 66/94] Verify security group parameters
+Subject: [PATCH 66/95] Verify security group parameters
Introduced various sanity checks before adding security group rule
into the database. The checks have been implemented both in EC2 and
diff --git a/0067-Bug-886353-Faults-raised-by-OpenStack-API-Resource-h.patch b/0067-Bug-886353-Faults-raised-by-OpenStack-API-Resource-h.patch
index b0e1d1f..94276cd 100644
--- a/0067-Bug-886353-Faults-raised-by-OpenStack-API-Resource-h.patch
+++ b/0067-Bug-886353-Faults-raised-by-OpenStack-API-Resource-h.patch
@@ -1,7 +1,7 @@
From 1270e11ef9fb3723e4a86bfe99d500ffbe615a4d Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor at citrix.com>
Date: Fri, 4 Nov 2011 14:00:37 -0700
-Subject: [PATCH 67/94] Bug #886353: Faults raised by OpenStack API Resource
+Subject: [PATCH 67/95] Bug #886353: Faults raised by OpenStack API Resource
handlers fail to be reported properly
In Resource.__call__, catch any faults.Fault that are thrown by the request
diff --git a/0068-Makes-sure-gateways-forward-properly.patch b/0068-Makes-sure-gateways-forward-properly.patch
index 3325cf2..4037ede 100644
--- a/0068-Makes-sure-gateways-forward-properly.patch
+++ b/0068-Makes-sure-gateways-forward-properly.patch
@@ -1,7 +1,7 @@
From e9f427fc2e8014eeba3f46284c38414209fb0b7e Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda at gmail.com>
Date: Wed, 16 Nov 2011 10:17:23 -0800
-Subject: [PATCH 68/94] Makes sure gateways forward properly
+Subject: [PATCH 68/95] Makes sure gateways forward properly
* Fixes bug 890195
* Fixes missing context in dhcp call
diff --git a/0069-Fix-a-minor-memory-leak.patch b/0069-Fix-a-minor-memory-leak.patch
index beade4c..4efd5d5 100644
--- a/0069-Fix-a-minor-memory-leak.patch
+++ b/0069-Fix-a-minor-memory-leak.patch
@@ -1,7 +1,7 @@
From d2ae5bef3d6dc253e942e284ed9149c3912b2385 Mon Sep 17 00:00:00 2001
From: "Kevin L. Mitchell" <kevin.mitchell at rackspace.com>
Date: Fri, 18 Nov 2011 14:49:41 -0600
-Subject: [PATCH 69/94] Fix a minor memory leak
+Subject: [PATCH 69/95] Fix a minor memory leak
Fixes a minor memory leak caused by a self-referential data structure
with a __del__() method by explicitly breaking the cycle.
diff --git a/0070-Fixes-bug-886263.patch b/0070-Fixes-bug-886263.patch
index ec52c24..4b97fd0 100644
--- a/0070-Fixes-bug-886263.patch
+++ b/0070-Fixes-bug-886263.patch
@@ -1,7 +1,7 @@
From a6aee7386eb68d749668193547c18e2e4d661724 Mon Sep 17 00:00:00 2001
From: Nachi Ueno <ueno.nachi at lab.ntt.co.jp>
Date: Thu, 10 Nov 2011 10:35:57 +0900
-Subject: [PATCH 70/94] Fixes bug 886263.
+Subject: [PATCH 70/95] Fixes bug 886263.
IndexError: pop index out of range on replace_uuid_with_id
diff --git a/0071-Fix-for-bug-894431.patch b/0071-Fix-for-bug-894431.patch
index 15eb83f..c33b4dc 100644
--- a/0071-Fix-for-bug-894431.patch
+++ b/0071-Fix-for-bug-894431.patch
@@ -1,7 +1,7 @@
From 18d0c9a59d94fc23b3fdf03b609ed11e6597e717 Mon Sep 17 00:00:00 2001
From: Brad Hall <brad at nicira.com>
Date: Thu, 24 Nov 2011 07:44:02 -0800
-Subject: [PATCH 71/94] Fix for bug 894431
+Subject: [PATCH 71/95] Fix for bug 894431
Make sure we set the correct interface id
diff --git a/0072-Bug-897091-nova-actions-fails-with-HTTP-400-TypeErro.patch b/0072-Bug-897091-nova-actions-fails-with-HTTP-400-TypeErro.patch
index 7be76b1..194984a 100644
--- a/0072-Bug-897091-nova-actions-fails-with-HTTP-400-TypeErro.patch
+++ b/0072-Bug-897091-nova-actions-fails-with-HTTP-400-TypeErro.patch
@@ -1,7 +1,7 @@
From c733462b229290210d6249e0f8fc7d2beaab9091 Mon Sep 17 00:00:00 2001
From: Ewan Mellor <ewan.mellor at citrix.com>
Date: Sun, 27 Nov 2011 23:26:49 -0800
-Subject: [PATCH 72/94] Bug #897091: "nova actions" fails with HTTP 400 /
+Subject: [PATCH 72/95] Bug #897091: "nova actions" fails with HTTP 400 /
TypeError if a server action has been performed
Fix code in Controller.action that was overwriting the definition of the
diff --git a/0073-removed-logic-of-throwing-exception-if-no-floating-i.patch b/0073-removed-logic-of-throwing-exception-if-no-floating-i.patch
index 70b660e..71db7da 100644
--- a/0073-removed-logic-of-throwing-exception-if-no-floating-i.patch
+++ b/0073-removed-logic-of-throwing-exception-if-no-floating-i.patch
@@ -1,7 +1,7 @@
From 78e81f1b7c0c2cc9b1e447cf3dce47d3b6ed0ce3 Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse at gmail.com>
Date: Mon, 28 Nov 2011 17:00:47 -0800
-Subject: [PATCH 73/94] removed logic of throwing exception if no floating ip
+Subject: [PATCH 73/95] removed logic of throwing exception if no floating ip
fixes 897089
diff --git a/0074-Fix-RPC-responses-to-allow-None-response-correctly.patch b/0074-Fix-RPC-responses-to-allow-None-response-correctly.patch
index 471ec43..0d24ef8 100644
--- a/0074-Fix-RPC-responses-to-allow-None-response-correctly.patch
+++ b/0074-Fix-RPC-responses-to-allow-None-response-correctly.patch
@@ -1,7 +1,7 @@
From 475f3624245500c5382faf5b2708a59fcec2c9ad Mon Sep 17 00:00:00 2001
From: Chris Behrens <cbehrens at codestud.com>
Date: Tue, 29 Nov 2011 09:01:16 -0800
-Subject: [PATCH 74/94] Fix RPC responses to allow None response correctly.
+Subject: [PATCH 74/95] Fix RPC responses to allow None response correctly.
Fixes bug 897155
diff --git a/0075-Sanitize-EC2-manifests-and-image-tarballs.patch b/0075-Sanitize-EC2-manifests-and-image-tarballs.patch
index f634142..456f746 100644
--- a/0075-Sanitize-EC2-manifests-and-image-tarballs.patch
+++ b/0075-Sanitize-EC2-manifests-and-image-tarballs.patch
@@ -1,7 +1,7 @@
From 76363226bd8533256f7795bba358d7f4b8a6c9e6 Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry at openstack.org>
Date: Thu, 1 Dec 2011 17:54:16 +0100
-Subject: [PATCH 75/94] Sanitize EC2 manifests and image tarballs
+Subject: [PATCH 75/95] Sanitize EC2 manifests and image tarballs
Prevent potential directory traversal with malicious EC2 image tarballs,
by making sure the tarfile is safe before unpacking it. Fixes bug 894755
diff --git a/0076-Rename-.nova-venv-to-.venv.patch b/0076-Rename-.nova-venv-to-.venv.patch
index c5fe00d..39150f2 100644
--- a/0076-Rename-.nova-venv-to-.venv.patch
+++ b/0076-Rename-.nova-venv-to-.venv.patch
@@ -1,7 +1,7 @@
From 18a5ca1c20729e4f3309dc1785999ecf3255616f Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair at hp.com>
Date: Thu, 8 Dec 2011 15:14:48 -0800
-Subject: [PATCH 76/94] Rename .nova-venv to .venv.
+Subject: [PATCH 76/95] Rename .nova-venv to .venv.
This simplifies a number of Jenkins jobs which currently, other
than directory names, could be the same for all OpenStack
diff --git a/0077-Fix-issue-in-test_s3_malicious_tarballs.patch b/0077-Fix-issue-in-test_s3_malicious_tarballs.patch
index 49f2d31..fd717e8 100644
--- a/0077-Fix-issue-in-test_s3_malicious_tarballs.patch
+++ b/0077-Fix-issue-in-test_s3_malicious_tarballs.patch
@@ -1,7 +1,7 @@
From 98877f9c3f633225315dadd8ea8e580ab623506a Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry at openstack.org>
Date: Tue, 13 Dec 2011 17:10:44 +0100
-Subject: [PATCH 77/94] Fix issue in test_s3_malicious_tarballs
+Subject: [PATCH 77/95] Fix issue in test_s3_malicious_tarballs
The previous commit backported a master commit which added a test
that cannot run successfully on stable/diablo due to a missing
diff --git a/0078-Fixes-bug-888649.patch b/0078-Fixes-bug-888649.patch
index ab69069..459fd39 100644
--- a/0078-Fixes-bug-888649.patch
+++ b/0078-Fixes-bug-888649.patch
@@ -1,7 +1,7 @@
From 5d319531552689e4842a84adce01c81899cdfb17 Mon Sep 17 00:00:00 2001
From: Ollie Leahy <oliver.leahy at hp.com>
Date: Thu, 24 Nov 2011 15:56:08 +0000
-Subject: [PATCH 78/94] Fixes bug 888649
+Subject: [PATCH 78/95] Fixes bug 888649
Change exception.VolumeIsBusy to derive from NovaException instead of
Error, so that an 'unexpected keyword' exception is not thrown when
diff --git a/0079-Fixes-bug-767947.patch b/0079-Fixes-bug-767947.patch
index 5332ef1..4cf8de0 100644
--- a/0079-Fixes-bug-767947.patch
+++ b/0079-Fixes-bug-767947.patch
@@ -1,7 +1,7 @@
From add84707ec40bc4de1de5616da41b2ac5f4a9537 Mon Sep 17 00:00:00 2001
From: Alvaro Lopez Garcia <aloga at ifca.unican.es>
Date: Wed, 30 Nov 2011 12:25:00 +0100
-Subject: [PATCH 79/94] Fixes bug 767947
+Subject: [PATCH 79/95] Fixes bug 767947
If libvirt was restarted, a libvirt.libvirtError was raised with error
domain libvirt.VIR_FROM_RPC when trying to use the existing connection.
diff --git a/0080-Add-Support-to-delete-VMs-in-error-state.patch b/0080-Add-Support-to-delete-VMs-in-error-state.patch
index acb9ecc..8ea17ba 100644
--- a/0080-Add-Support-to-delete-VMs-in-error-state.patch
+++ b/0080-Add-Support-to-delete-VMs-in-error-state.patch
@@ -1,7 +1,7 @@
From 400095e7f37020b8d671a1559452d88512fd60e8 Mon Sep 17 00:00:00 2001
From: Joe Gordon <jogo at cloudscaling.com>
Date: Mon, 2 Jan 2012 17:16:06 -0800
-Subject: [PATCH 80/94] Add Support to delete VMs in error state.
+Subject: [PATCH 80/95] Add Support to delete VMs in error state.
Already supported in master
diff --git a/0081-Fix-to-correctly-report-memory-on-Linux-3.X.patch b/0081-Fix-to-correctly-report-memory-on-Linux-3.X.patch
index 09f78aa..becac51 100644
--- a/0081-Fix-to-correctly-report-memory-on-Linux-3.X.patch
+++ b/0081-Fix-to-correctly-report-memory-on-Linux-3.X.patch
@@ -1,7 +1,7 @@
From c067876e587ac55cd139f054900ca5219089ae22 Mon Sep 17 00:00:00 2001
From: Mandell Degerness <mdegerne at gmail.com>
Date: Mon, 21 Nov 2011 23:54:36 +0000
-Subject: [PATCH 81/94] Fix to correctly report memory on Linux 3.X.
+Subject: [PATCH 81/95] Fix to correctly report memory on Linux 3.X.
If sys is compiled on a Linux 3.X system, it returns LINUX3 instead of
LINUX2 for sys.platform.upper().
diff --git a/0082-avoid-error-and-trace-on-dom.vcpus-in-lxc.patch b/0082-avoid-error-and-trace-on-dom.vcpus-in-lxc.patch
index 4745f0e..28c150b 100644
--- a/0082-avoid-error-and-trace-on-dom.vcpus-in-lxc.patch
+++ b/0082-avoid-error-and-trace-on-dom.vcpus-in-lxc.patch
@@ -1,7 +1,7 @@
From abea7aac12704dcd0bc337e03f4e47a8ec189df8 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser at ubuntu.com>
Date: Tue, 13 Dec 2011 16:48:05 -0500
-Subject: [PATCH 82/94] avoid error and trace on dom.vcpus() in lxc
+Subject: [PATCH 82/95] avoid error and trace on dom.vcpus() in lxc
This fixes bug 903943. If you used lxc, you'd eventually
see stack traces in nova-compute due to use of dom.vcpus().
diff --git a/0083-Bug-751229-Floating-address-range-fixed.patch b/0083-Bug-751229-Floating-address-range-fixed.patch
index 94a2453..52afbb8 100644
--- a/0083-Bug-751229-Floating-address-range-fixed.patch
+++ b/0083-Bug-751229-Floating-address-range-fixed.patch
@@ -1,7 +1,7 @@
From 1085e9d0fdc81eea734482e42a5fcb6ae1f4e8f7 Mon Sep 17 00:00:00 2001
From: Ivan Kolodyazhny <e0ne at e0ne.info>
Date: Wed, 28 Dec 2011 23:30:35 +0200
-Subject: [PATCH 83/94] Bug 751229: Floating address range fixed
+Subject: [PATCH 83/95] Bug 751229: Floating address range fixed
Change-Id: I4c7ab8512fe3a00dd555d3a183b2c2348cef9e21
---
diff --git a/0084-Bug-820059-bin-nova-manage.py-VpnCommands.spawn-call.patch b/0084-Bug-820059-bin-nova-manage.py-VpnCommands.spawn-call.patch
index 8edb463..a9ff291 100644
--- a/0084-Bug-820059-bin-nova-manage.py-VpnCommands.spawn-call.patch
+++ b/0084-Bug-820059-bin-nova-manage.py-VpnCommands.spawn-call.patch
@@ -1,7 +1,7 @@
From fc37582812747887ebcce766fd80541da98c3b43 Mon Sep 17 00:00:00 2001
From: Ivan Kolodyazhny <e0ne at e0ne.info>
Date: Thu, 24 Nov 2011 14:54:30 +0200
-Subject: [PATCH 84/94] Bug 820059: bin/nova-manage.py VpnCommands.spawn calls
+Subject: [PATCH 84/95] Bug 820059: bin/nova-manage.py VpnCommands.spawn calls
non-existant method VpnCommands._vpn_for - fixed
Change-Id: I86c509d98fac685a5d658f397d0672f71b4bc175
diff --git a/0085-Pass-r-option-to-collie-cluster-status.patch b/0085-Pass-r-option-to-collie-cluster-status.patch
index 63b55da..bcbe3e4 100644
--- a/0085-Pass-r-option-to-collie-cluster-status.patch
+++ b/0085-Pass-r-option-to-collie-cluster-status.patch
@@ -1,7 +1,7 @@
From 43e0b44db00b3aece584978dace0bcc84e0eef52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= <francois.charlier at enovance.com>
Date: Fri, 2 Dec 2011 16:55:21 +0100
-Subject: [PATCH 85/94] Pass '-r' option to 'collie cluster status'.
+Subject: [PATCH 85/95] Pass '-r' option to 'collie cluster status'.
The 'collie cluster status' default output is more verbose since
sheepdog 0.24. The '-r' (raw) option has been added for less verbose
diff --git a/0086-Fixing-snapshot-failure-task_state.patch b/0086-Fixing-snapshot-failure-task_state.patch
index aef0559..4314617 100644
--- a/0086-Fixing-snapshot-failure-task_state.patch
+++ b/0086-Fixing-snapshot-failure-task_state.patch
@@ -1,7 +1,7 @@
From 7e4e216e9011014d926d9a90afe46d4b64c0e369 Mon Sep 17 00:00:00 2001
From: David Subiros <david.perez5 at hp.com>
Date: Wed, 30 Nov 2011 09:45:23 +0000
-Subject: [PATCH 86/94] Fixing snapshot failure task_state
+Subject: [PATCH 86/95] Fixing snapshot failure task_state
fixes bug 898162
If a snapshot fails now the instance task_state is set back to None.
diff --git a/0087-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch b/0087-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
index 68563c0..ea08d40 100644
--- a/0087-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
+++ b/0087-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
@@ -1,7 +1,7 @@
From 8be66ace12f3af6bbc7cdbe651a78fd9ab363eeb 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 87/94] Add INPUT chain rule for EC2 metadata requests
+Subject: [PATCH 87/95] Add INPUT chain rule for EC2 metadata requests
(lp:856385)
On Fedora, the default policy for the INPUT chain in the filter table
diff --git a/0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch b/0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
index d4534d1..9884f1b 100644
--- a/0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
+++ b/0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
@@ -1,7 +1,7 @@
From ec3c303f4e240c04400bc3c7d6e9171bc76457dc 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 88/94] Have nova-api add the INPUT rule for EC2 metadata
+Subject: [PATCH 88/95] Have nova-api add the INPUT rule for EC2 metadata
(lp:856385)
It makes no sense to have nova-network add an iptables rule for the EC2
diff --git a/0089-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch b/0089-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
index 57c0a6d..70029db 100644
--- a/0089-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
+++ b/0089-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
@@ -1,7 +1,7 @@
From 8593b6efeb2650c4630f86caff9008c5360b0ad4 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 89/94] Allow the user to choose either ietadm or tgtadm
+Subject: [PATCH 89/95] Allow the user to choose either ietadm or tgtadm
(lp:819997)
(Actually authored by Chuck Short <zulcss at ubuntu.com> but Gerrit won't
diff --git a/0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch b/0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
index 9073e82..524cb6b 100644
--- a/0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
+++ b/0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
@@ -1,7 +1,7 @@
From 84a16797a74adaa8a80027ced259e36384f23ef1 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 90/94] Remove VolumeDriver.sync_exec method (lp:819997)
+Subject: [PATCH 90/95] Remove VolumeDriver.sync_exec method (lp:819997)
We always use the same functions for sync_exec and execute.
diff --git a/0091-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch b/0091-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
index 22418b4..3caf22f 100644
--- a/0091-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
+++ b/0091-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
@@ -1,7 +1,7 @@
From 115346111630c53fe258840bac130e6a578b4bcb 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 91/94] Refactor ietadm/tgtadm calls out into helper classes
+Subject: [PATCH 91/95] Refactor ietadm/tgtadm calls out into helper classes
(lp:819997)
Add a new TargetAdmin abstract base class and implement it using ietadm
diff --git a/0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch b/0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
new file mode 100644
index 0000000..1ce0f76
--- /dev/null
+++ b/0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
@@ -0,0 +1,38 @@
+From c0804a0656cf8b1e36164bac0d4462bc50090967 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 92/95] Fix tgtadm off by one error. Fixes bug #871278
+
+(cherry picked from commit 15cc877cc2af71135b896974f17cb4a63291a08c)
+
+Change-Id: Ia359045465ada9753b86d1a08cc947966b3ac899
+Signed-off-by: Chuck Short <chuck.short at canonical.com>
+---
+ nova/volume/driver.py | 11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/nova/volume/driver.py b/nova/volume/driver.py
+index 82f0106..7069626 100644
+--- a/nova/volume/driver.py
++++ b/nova/volume/driver.py
+@@ -533,9 +533,14 @@ class ISCSIDriver(VolumeDriver):
+
+ self._iscsiadm_update(iscsi_properties, "node.startup", "automatic")
+
+- mount_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-0" %
+- (iscsi_properties['target_portal'],
+- iscsi_properties['target_iqn']))
++ if FLAGS.iscsi_helper == 'tgtadm':
++ mount_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-1" %
++ (iscsi_properties['target_portal'],
++ iscsi_properties['target_iqn']))
++ else:
++ mount_device = ("/dev/disk/by-path/ip-%s-iscsi-%s-lun-0" %
++ (iscsi_properties['target_portal'],
++ iscsi_properties['target_iqn']))
+
+ # The /dev/disk/by-path/... node is not always present immediately
+ # TODO(justinsb): This retry-with-delay is a pattern, move to utils?
+--
+1.7.6.5
+
diff --git a/0092-Bug-898257-abstract-out-disk-image-access-methods.patch b/0093-Bug-898257-abstract-out-disk-image-access-methods.patch
similarity index 99%
rename from 0092-Bug-898257-abstract-out-disk-image-access-methods.patch
rename to 0093-Bug-898257-abstract-out-disk-image-access-methods.patch
index 7595368..3a6ec81 100644
--- a/0092-Bug-898257-abstract-out-disk-image-access-methods.patch
+++ b/0093-Bug-898257-abstract-out-disk-image-access-methods.patch
@@ -1,7 +1,7 @@
-From 463a14c7c722d1cbd51b0deaf23c1b0179f870f8 Mon Sep 17 00:00:00 2001
+From a905d77d8dcf1e90c7a55a5823853bddcc904c67 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 92/94] Bug#898257 abstract out disk image access methods
+Subject: [PATCH 93/95] Bug#898257 abstract out disk image access methods
Rather than providing two mutually exlusive image
access methods (loop and qemu-nbd), try each in turn.
diff --git a/0093-Bug-898257-support-handling-images-with-libguestfs.patch b/0094-Bug-898257-support-handling-images-with-libguestfs.patch
similarity index 97%
rename from 0093-Bug-898257-support-handling-images-with-libguestfs.patch
rename to 0094-Bug-898257-support-handling-images-with-libguestfs.patch
index 502c594..1709913 100644
--- a/0093-Bug-898257-support-handling-images-with-libguestfs.patch
+++ b/0094-Bug-898257-support-handling-images-with-libguestfs.patch
@@ -1,7 +1,7 @@
-From 8ebcb58bbe45f1541237678c74dda51cfb8623c1 Mon Sep 17 00:00:00 2001
+From 9694e31bc3bccbdcdc78b32820600df4b3c0b08f 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 93/94] Bug#898257 support handling images with libguestfs
+Subject: [PATCH 94/95] Bug#898257 support handling images with libguestfs
http://libguestfs.org/ provides both utilities and libraries
to manipulate image files containing various operating systems.
diff --git a/0094-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0095-Ensure-we-don-t-access-the-net-when-building-docs.patch
similarity index 89%
rename from 0094-Ensure-we-don-t-access-the-net-when-building-docs.patch
rename to 0095-Ensure-we-don-t-access-the-net-when-building-docs.patch
index 4a55f6a..ee44704 100644
--- a/0094-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0095-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -1,7 +1,7 @@
-From 9d2631367bab92367fb7c137ddad5701ac29b0c0 Mon Sep 17 00:00:00 2001
+From 64fbfc014bc9cb0d48b1a0c6e616c275b277e66c 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 94/94] Ensure we don't access the net when building docs
+Subject: [PATCH 95/95] Ensure we don't access the net when building docs
(Note, this has not been sent upstream)
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 53892bf..32b1a4e 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
Name: openstack-nova
Version: 2011.3
-Release: 16%{?dist}
+Release: 17%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
@@ -129,11 +129,12 @@ Patch88: 0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patc
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-Bug-898257-abstract-out-disk-image-access-methods.patch
-Patch93: 0093-Bug-898257-support-handling-images-with-libguestfs.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
# This is Fedora specific and not upstream
-Patch94: 0094-Ensure-we-don-t-access-the-net-when-building-docs.patch
+Patch95: 0095-Ensure-we-don-t-access-the-net-when-building-docs.patch
BuildArch: noarch
BuildRequires: intltool
@@ -362,6 +363,7 @@ This package contains documentation files for nova.
%patch92 -p1
%patch93 -p1
%patch94 -p1
+%patch95 -p1
find . \( -name .gitignore -o -name .placeholder \) -delete
@@ -548,6 +550,9 @@ fi
%endif
%changelog
+* Fri Jan 6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-17
+- Backport tgtadm off-by-one fix from upstream (#752709)
+
* Fri Jan 6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-16
- Rebase to latest upstream stable/diablo, pulling in ~50 patches
More information about the scm-commits
mailing list