[openstack-nova] Fix up recent patches which don't apply
Mark McLoughlin
markmc at fedoraproject.org
Fri Jan 6 13:46:52 UTC 2012
commit be33b4d8c787da9bda83b21e25589bb0356b72cf
Author: Mark McLoughlin <markmc at redhat.com>
Date: Fri Jan 6 13:44:51 2012 +0000
Fix up recent patches which don't apply
0001-Add-tools-rfc.sh-from-master.patch | 4 +-
0002-Don-t-use-GitPython-for-authors-check.patch | 4 +-
...Made-jenkins-email-pruning-more-resilient.patch | 4 +-
0004-Removing-old-code-that-snuck-back-in.patch | 4 +-
...outstanding-pep8-errors-for-a-clean-trunk.patch | 4 +-
0006-Point-tools-rfc.sh-at-the-right-branch.patch | 4 +-
...kes-sure-to-recreate-gateway-for-moved-ip.patch | 4 +-
...y-qualified-domain-name-in-local-hostname.patch | 4 +-
...e-grantee-group-loading-for-source-groups.patch | 4 +-
...ders-when-auth_token-is-None.-Fixes-bug-8.patch | 5 +--
...pool-complexities-from-nova.db.sqlalchemy.patch | 4 +-
0012-Raise-InsufficientFreeMemory.patch | 4 +-
0013-Don-t-leak-exceptions-out-to-users.patch | 4 +-
...snapshots-work-for-amis.-Fixes-bug-873156.patch | 4 +-
0015-Add-missing-author.patch | 4 +-
0016-Make-snapshots-private-by-default.patch | 4 +-
...ackups-can-no-longer-happen-simultaneousl.patch | 6 ++--
0018-Fixed-bug-lp850602.patch | 22 ++++++++--------
0019-bug-861310.patch | 4 +-
0020-Enforce-snapshot-cleanup.patch | 8 +++---
0021-bug-lp845714.patch | 4 +-
...-version-specifier-to-kombu-in-pip-requir.patch | 6 ++--
...nant-id-to-the-create-images-response-Loc.patch | 6 ++--
...-bug-862633-OS-api-consoles-create-broken.patch | 4 +-
0025-Deallocate-ip-if-build-fails.patch | 4 +-
...p-returning-correct-password-on-api-calls.patch | 4 +-
0027-Handle-pidfile-exception-for-dnsmasq.patch | 4 +-
0028-Make-sure-unknown-extensions-return-404.patch | 4 +-
...ginal-exception-in-ClassNotFound-exceptio.patch | 4 +-
...default-FLAGS.logfile_mode-is-properly-co.patch | 6 ++--
...t-errors-on-confirm-revertResize-failures.patch | 4 +-
...ds-ext4-and-reiserfs-to-_mount_filesystem.patch | 4 +-
0033-Improve-access-check-on-images.patch | 4 +-
...es-bug-834633-Auto-assigning-floating-IPs.patch | 4 +-
0035-fixes-bug-883233.patch | 6 ++--
...x-deletion-of-instances-without-fixed-ips.patch | 4 +-
...njection-for-OSAPI-rebuilds.-Fixes-881649.patch | 4 +-
0038-Add-.gitreview-config-file-for-gerrit.patch | 8 +++---
...ulk-create-fixed-ips.-The-true-issue-here.patch | 16 ++++++------
0040-Retry-failed-SQL-connections-LP-876663.patch | 4 +-
...-NoAuth-to-account-for-requests-ending-in.patch | 4 +-
...etworks-returned-from-get_instance_nw_inf.patch | 6 ++--
...ajax_console_proxy_port-needs-to-be-an-in.patch | 5 +--
...-861160-newly-created-network-has-no-uuid.patch | 12 ++++----
...yError-when-passed-unknown-format-of-time.patch | 4 +-
...-Add-local-storage-of-context-for-logging.patch | 4 +-
...4863-nova-logs-everything-to-syslog-twice.patch | 8 +++---
...nova-ajax-console-proxy-crashes-on-shutdo.patch | 5 +--
...xception.KeypairNotFound-usage-correction.patch | 4 +-
0050-fix-bug-816630.patch | 12 ++++----
0051-Log-the-exception-when-we-get-one.patch | 6 ++--
0052-Change-floating-snat-to-float-snat.patch | 4 +-
0053-Fix-for-launchpad-bug-882568.patch | 4 +-
0054-Undefine-libvirt-saved-instances.patch | 8 +++---
...l-dropped-exception-when-a-new-exception-.patch | 7 ++---
...Fix-exception-reraising-in-volume-manager.patch | 4 +-
...e-run-instances-respect-availability-zone.patch | 4 +-
...kes-rpc_allocate_fixed_ip-return-properly.patch | 4 +-
...ption.wrap_exception-so-that-all-exceptio.patch | 7 ++---
0060-Move-failed-instances-to-error-state.patch | 4 +-
0061-Fixes-LP878319.patch | 4 +-
0062-Fixes-bug-871877.patch | 4 +-
...-exit-with-status-1-if-an-image-registrat.patch | 6 ++--
...-notification-bug-when-creating-instances.patch | 14 +++++-----
0065-fix-rebuild-sha1-not-string-error.patch | 4 +-
0066-Verify-security-group-parameters.patch | 8 +++---
...Faults-raised-by-OpenStack-API-Resource-h.patch | 4 +-
0068-Makes-sure-gateways-forward-properly.patch | 4 +-
0069-Fix-a-minor-memory-leak.patch | 4 +-
0070-Fixes-bug-886263.patch | 4 +-
0071-Fix-for-bug-894431.patch | 8 +++---
...nova-actions-fails-with-HTTP-400-TypeErro.patch | 6 ++--
...ic-of-throwing-exception-if-no-floating-i.patch | 8 +++---
...esponses-to-allow-None-response-correctly.patch | 18 +++++++-------
...Sanitize-EC2-manifests-and-image-tarballs.patch | 4 +-
0076-Rename-.nova-venv-to-.venv.patch | 26 +++----------------
0077-Fix-issue-in-test_s3_malicious_tarballs.patch | 4 +-
0078-Fixes-bug-888649.patch | 12 ++++----
0079-Fixes-bug-767947.patch | 25 ++++--------------
...-Add-Support-to-delete-VMs-in-error-state.patch | 4 +-
...x-to-correctly-report-memory-on-Linux-3.X.patch | 4 +-
...avoid-error-and-trace-on-dom.vcpus-in-lxc.patch | 6 ++--
0083-Bug-751229-Floating-address-range-fixed.patch | 4 +-
...bin-nova-manage.py-VpnCommands.spawn-call.patch | 21 +++-------------
0085-Pass-r-option-to-collie-cluster-status.patch | 6 ++--
0086-Fixing-snapshot-failure-task_state.patch | 4 +-
...hain-rule-for-EC2-metadata-requests-lp-85.patch | 5 +--
...pi-add-the-INPUT-rule-for-EC2-metadata-lp.patch | 4 +-
...ser-to-choose-either-ietadm-or-tgtadm-lp-.patch | 5 +--
...e-VolumeDriver.sync_exec-method-lp-819997.patch | 4 +-
...tadm-tgtadm-calls-out-into-helper-classes.patch | 4 +-
...tgtadm-off-by-one-error.-Fixes-bug-871278.patch | 4 +-
...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 | 8 ++++-
96 files changed, 270 insertions(+), 317 deletions(-)
---
diff --git a/0001-Add-tools-rfc.sh-from-master.patch b/0001-Add-tools-rfc.sh-from-master.patch
index 269db4a..8d297dd 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 24839ef2b4c72b87d1c2aed011553a19330a2524 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/95] Add tools/rfc.sh from master
+Subject: [PATCH] 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 839eb8b..7b9a1cf 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 62c7e6110bf93d8408ab656d811d4642e68aa6b5 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/95] Don't use GitPython for authors check
+Subject: [PATCH] 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 c77c706..98294d0 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 95630ca3e6e26630cc9b5ba8c73fd7531683e8d2 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/95] Made jenkins email pruning more resilient.
+Subject: [PATCH] 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 9085dc7..c6eee75 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 e44b3461fd03f2802f38ce4e88951fb9f4e7586d 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/95] Removing old code that snuck back in
+Subject: [PATCH] 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 e2f1391..7f1dbd0 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 877ff7aa19244959bb71400180e3107c6b7fe8b3 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/95] Fix outstanding pep8 errors for a clean trunk.
+Subject: [PATCH] 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 908917f..7349fea 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 208b3f160c67bf082f71ba97b8834f1917f2eb4c 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/95] Point tools/rfc.sh at the right branch
+Subject: [PATCH] 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 a19e746..5da1920 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 750141ff56a70d16dcf92929e7d7e8bb9d88d5be 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/95] Makes sure to recreate gateway for moved ip
+Subject: [PATCH] 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 da26f3d..81bd499 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 21378809edee3b649dfd80f8d65a5992caf374e7 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/95] put fully qualified domain name in local-hostname
+Subject: [PATCH] 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 ca7f293..5d8ce8e 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 1171ac66de5259da9b22ccd1a71d6a64f6c738db 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/95] Fix the grantee group loading for source groups
+Subject: [PATCH] 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 1847f03..58bfdbb 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,8 +1,7 @@
-From 2754749c3767b7ddd90957b528828e235e25ccab Mon Sep 17 00:00:00 2001
+From fb13e864b53eaabd308a604966478ca5574b4393 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/95] Call endheaders when auth_token is None. Fixes bug
- 856721.
+Subject: [PATCH] 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 484b43c..22c77a1 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 a3eb559662b05a0520b0b754f5c8896e94511f85 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/95] Removed db_pool complexities from
+Subject: [PATCH] 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 1b0f9c4..9080b0e 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 e7485702d8da8440c4d4f43cd4f22887ba14a9a7 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/95] Raise InsufficientFreeMemory
+Subject: [PATCH] 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 463e396..b03fc59 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 80b1dc5f01295d6f58527f8eedc8ea9ce3886d02 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/95] Don't leak exceptions out to users
+Subject: [PATCH] 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 1db6ef7..afebb72 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 8479e1308c93cd1af8790405b12b627e4ecdd488 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/95] Makes snapshots work for amis. Fixes bug 873156
+Subject: [PATCH] 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 df6dd0f..3ddc249 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 fe9c6285fb5f0ed2ebe74372bae45634774a7bd9 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/95] Add missing author
+Subject: [PATCH] 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 f051610..5fe2b2e 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 b44ac53106e99cb4b87220e2672ec516c2de26b0 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/95] Make snapshots private by default
+Subject: [PATCH] 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 f575e17..036fa18 100644
--- a/0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
+++ b/0017-Snapshots-backups-can-no-longer-happen-simultaneousl.patch
@@ -1,8 +1,8 @@
-From 852b9307ac86b20cbe870aa5bbfaf121226f5440 Mon Sep 17 00:00:00 2001
+From fc4bf659d0d05827c8151a21572f5cffa615c6cf 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/95] Snapshots/backups can no longer happen simultaneously.
- Tests included.
+Subject: [PATCH] Snapshots/backups can no longer happen simultaneously. Tests
+ included.
Implemented exception.InstanceBusy when attempting to snapshot/backup an
instance which is already snapshotting or being currently backed up.
diff --git a/0018-Fixed-bug-lp850602.patch b/0018-Fixed-bug-lp850602.patch
index 6dd889e..8ba23bd 100644
--- a/0018-Fixed-bug-lp850602.patch
+++ b/0018-Fixed-bug-lp850602.patch
@@ -1,8 +1,8 @@
-From 744a0d8e7aa2c16fe55098c96cf9e46984838a4f Mon Sep 17 00:00:00 2001
+From 4f9c1ff04f3fb359e361756097eb7f7367676487 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/95] Fixed bug lp850602. Adding backing file copy operation
- on kvm block migration.
+Subject: [PATCH] Fixed bug lp850602. Adding backing file copy operation on
+ kvm block migration.
(cherry picked from commit b9aac1181581b9036c98f5aa493731fdc74be7e1)
@@ -13,10 +13,10 @@ Change-Id: Ia2311ef0e65e97bad7e425ad6affdb5f864043ea
2 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
-index 8d28590..0f01de8 100644
+index 51e584d..0673af2 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
-@@ -794,7 +794,8 @@ class LibvirtConnTestCase(test.TestCase):
+@@ -835,7 +835,8 @@ class LibvirtConnTestCase(test.TestCase):
# Test data
instance_ref = db.instance_create(self.context, self.test_instance)
@@ -26,7 +26,7 @@ index 8d28590..0f01de8 100644
# Preparing mocks
# qemu-img should be mockd since test environment might not have
-@@ -835,7 +836,10 @@ class LibvirtConnTestCase(test.TestCase):
+@@ -876,7 +877,10 @@ class LibvirtConnTestCase(test.TestCase):
"</devices></domain>")
ret = ("image: /test/disk\nfile format: raw\n"
@@ -38,7 +38,7 @@ index 8d28590..0f01de8 100644
# Preparing mocks
vdmock = self.mox.CreateMock(libvirt.virDomain)
-@@ -865,7 +869,9 @@ class LibvirtConnTestCase(test.TestCase):
+@@ -906,7 +910,9 @@ class LibvirtConnTestCase(test.TestCase):
info[0]['path'] == '/test/disk' and
info[1]['path'] == '/test/disk.local' and
info[0]['local_gb'] == '10G' and
@@ -50,10 +50,10 @@ index 8d28590..0f01de8 100644
db.instance_destroy(self.context, instance_ref['id'])
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
-index 9290c5e..00be545 100644
+index 4b45515..7baeb69 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
-@@ -1722,9 +1722,31 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1729,9 +1729,31 @@ class LibvirtConnection(driver.ComputeDriver):
for info in disk_info:
base = os.path.basename(info['path'])
@@ -87,7 +87,7 @@ index 9290c5e..00be545 100644
instance_disk, info['local_gb'])
# if image has kernel and ramdisk, just download
-@@ -1815,12 +1837,17 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1822,12 +1844,17 @@ class LibvirtConnection(driver.ComputeDriver):
driver_nodes[cnt].get_properties().get_next().getContent()
if disk_type == 'raw':
size = int(os.path.getsize(path))
@@ -105,7 +105,7 @@ index 9290c5e..00be545 100644
# block migration needs same/larger size of empty image on the
# destination host. since qemu-img creates bit smaller size image
# depending on original image size, fixed value is necessary.
-@@ -1836,7 +1863,7 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -1843,7 +1870,7 @@ class LibvirtConnection(driver.ComputeDriver):
break
disk_info.append({'type': disk_type, 'path': path,
diff --git a/0019-bug-861310.patch b/0019-bug-861310.patch
index 5ef2c1a..8374f59 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 213739f404e67de320aeafc6c95db2b38db85ef6 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/95] bug 861310
+Subject: [PATCH] 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 213ebc8..5d88602 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 1d1588f3d3a244d2e3dffed86af44a0f9ab944de 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/95] Enforce snapshot cleanup.
+Subject: [PATCH] Enforce snapshot cleanup.
Makes sure that the snapshot and the temporary directory is cleaned up,
even if qemu-img fails. Fixes bug 861582.
@@ -27,10 +27,10 @@ index f3962c8..f23565b 100644
Devendra Modium <dmodium at isi.edu>
Devin Carlen <devin.carlen at gmail.com>
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
-index 00be545..da00df0 100644
+index 7baeb69..67f4434 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
-@@ -445,29 +445,31 @@ class LibvirtConnection(driver.ComputeDriver):
+@@ -452,29 +452,31 @@ class LibvirtConnection(driver.ComputeDriver):
# Export the snapshot to a raw image
temp_dir = tempfile.mkdtemp()
diff --git a/0021-bug-lp845714.patch b/0021-bug-lp845714.patch
index 922a5fb..a047fef 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 02d3ea7b3e051f14d015c5bf2f4179619871f25b 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/95] bug lp845714
+Subject: [PATCH] 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 5fb5986..0c36cab 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,8 +1,8 @@
-From 74ce079c65b4283de58d46cf63943db2860a06fe Mon Sep 17 00:00:00 2001
+From 70e52bdb507276320a35249c87161dd451ece1c8 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/95] Added ==1.0.4 version specifier to kombu in
- pip-requires to ensure tests pass in a clean venv.
+Subject: [PATCH] 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 bfe2dfe..cf31df4 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,8 +1,8 @@
-From 6f96fa65aa73e7803c9ba82d7a4f3b49b310e1b7 Mon Sep 17 00:00:00 2001
+From 2808dea7d9e8d16c43206a545fd4ef75533f11d7 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/95] Adds the tenant id to the create images response
- Location header Fixes bug 862672
+Subject: [PATCH] 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 af21ac7..987d177 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 ada9e22742581f11f36af02de531a9899c97ed59 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/95] Fixes bug 862633 -- OS api consoles create() broken
+Subject: [PATCH] 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 40a1fa4..108c66c 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 4f3e4974b709b2dc02faa116818c364233199acb 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/95] Deallocate ip if build fails.
+Subject: [PATCH] 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 48aabb5..2e975bc 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 11928a05be1c213551af418977575ad61b4514bb 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/95] Stop returning correct password on api calls
+Subject: [PATCH] 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 e58b148..7ad68c2 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 6c16e34097bdc96c557c94dc5692b06a60bcf631 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/95] Handle pidfile exception for dnsmasq
+Subject: [PATCH] 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 6df209f..b295ddd 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 aeb2224ec984206fb70962ddc8c1a611f71e3965 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/95] Make sure unknown extensions return 404
+Subject: [PATCH] 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 3e615ac..892588b 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 1576a68e95176f453e4085f9aa8f99328daa1d34 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/95] Include original exception in ClassNotFound exception
+Subject: [PATCH] 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 b5f39d8..9dcd18a 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,8 +1,8 @@
-From fdcfe762a52e30e09223f4128a5f4da530aefcf9 Mon Sep 17 00:00:00 2001
+From 2879dc668916b304dbb6cddfcc30949806477569 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/95] Ensure non-default FLAGS.logfile_mode is properly
- converted to an octet.
+Subject: [PATCH] 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 7255f78..1acf367 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 ec91a845df453a71e154d039c162d51c7ef67116 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/95] Explicit errors on confirm/revertResize failures
+Subject: [PATCH] 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 9b7ee64..ce928fc 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 931d0cb0fa80a967d4bfc55d55f5fc9624aed42d 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/95] Adds ext4 and reiserfs to _mount_filesystem().
+Subject: [PATCH] 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 ef57498..e65d5fd 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 5714b37e4de7de4bb1fb7ff54058751274b7d716 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/95] Improve access check on images
+Subject: [PATCH] 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 4f94f3d..85a3e78 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 6783b0126e08ad7fa45027fa7021b78a8a6655ff 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/95] Fixes bug 834633 - Auto assigning floating IPs
+Subject: [PATCH] Fixes bug 834633 - Auto assigning floating IPs
Details:
diff --git a/0035-fixes-bug-883233.patch b/0035-fixes-bug-883233.patch
index c217842..4e5a8c3 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 11d1eb3acd0746f3edcd3b96faad282271257f97 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/95] fixes bug 883233.
+Subject: [PATCH] fixes bug 883233.
fix typo in scheduler/driver.py assert_compute_node_has_enough_memory.
@@ -14,7 +14,7 @@ Change-Id: Idce87927a35b5986c970e6293428b3a5fddd00e4
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/Authors b/Authors
-index 2298120..e6ee68c 100644
+index cadfb26..cedd199 100644
--- a/Authors
+++ b/Authors
@@ -51,6 +51,7 @@ Jason Koelker <jason at koelker.net>
diff --git a/0036-Fix-deletion-of-instances-without-fixed-ips.patch b/0036-Fix-deletion-of-instances-without-fixed-ips.patch
index ebf5fda..615eff2 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 a1a3cb1dcb19fb21bc30755ce4afc30e0c9a6799 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/95] Fix deletion of instances without fixed ips.
+Subject: [PATCH] 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 6283d97..de23fe2 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 09511fe98f55b6cd9ea0c8cd691d1efe5249b647 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/95] Fix file injection for OSAPI rebuilds. Fixes 881649.
+Subject: [PATCH] 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 16d1496..1f5f681 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 7a833a57c66468efae9ea0932ab56089209d5812 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/95] Add .gitreview config file for gerrit.
+Subject: [PATCH] Add .gitreview config file for gerrit.
The CI team is developing a new tool, git-review:
@@ -32,10 +32,10 @@ index 0000000..3a2f61c
+port=29418
+project=openstack/nova.git
diff --git a/Authors b/Authors
-index cedd199..79741a7 100644
+index 03aedc2..b83f951 100644
--- a/Authors
+++ b/Authors
-@@ -46,6 +46,7 @@ Hisaki Ohara <hisaki.ohara at intel.com>
+@@ -47,6 +47,7 @@ Hisaki Ohara <hisaki.ohara at intel.com>
Ilya Alekseyev <ilyaalekseyev at acm.org>
Isaku Yamahata <yamahata at valinux.co.jp>
Jake Dahn <jake at ansolabs.com>
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 66ad5df..13c2667 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,11 +1,11 @@
-From 8405b63ad8d8c5f2c7ddb4614519ca2473d741c4 Mon Sep 17 00:00:00 2001
+From b038f5668dcb3b95de326d142fed74a2c10ff8ba 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/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
- the quantum tests on my laptop.
+Subject: [PATCH] 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 the quantum tests on my
+ laptop.
(pre)$ ./run_tests.sh -N nova.tests.test_quantum:QuantumNovaIPAMTestCase
QuantumNovaIPAMTestCase
@@ -68,10 +68,10 @@ index 6cc678a..665bdc1 100644
session = get_session()
with session.begin():
diff --git a/nova/network/manager.py b/nova/network/manager.py
-index d8de396..55066c3 100644
+index ef3dbd6..cab6f88 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
-@@ -835,15 +835,18 @@ class NetworkManager(manager.SchedulerDependentManager):
+@@ -838,15 +838,18 @@ class NetworkManager(manager.SchedulerDependentManager):
top_reserved = self._top_reserved_ips
project_net = netaddr.IPNetwork(network['cidr'])
num_ips = len(project_net)
diff --git a/0040-Retry-failed-SQL-connections-LP-876663.patch b/0040-Retry-failed-SQL-connections-LP-876663.patch
index d4494ad..66337c3 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 fb4450a4e0eb08f140b299b58951a0ed2371f00a 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/95] Retry failed SQL connections (LP #876663)
+Subject: [PATCH] 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 7cea74f..73ec5f2 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 bfde249ee44826dfd367930c1e91d0be3088db02 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/95] Updated NoAuth to account for requests ending in /
+Subject: [PATCH] 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 8fdc681..cbd4318 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,8 +1,8 @@
-From 029ee3023ec258e5900ec1918c5488bcaf6e677c Mon Sep 17 00:00:00 2001
+From 100d683b18601fcfd426d4990d68becce260307a 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/95] Make sure networks returned from get_instance_nw_info
- have a label
+Subject: [PATCH] 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 cb7b37d..8534bf1 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,8 +1,7 @@
-From 6b5a94149cc471c277883f390c122969a2e743f5 Mon Sep 17 00:00:00 2001
+From bdba48f394cecebacdd11b1a899e8ec3de2339d9 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/95] Bug 884527: ajax_console_proxy_port needs to be an
- integer
+Subject: [PATCH] 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 c92eb84..926e99f 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 ec88d55d468a7945d1c0ab2189cd0acdf28b78d2 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/95] Fix lp:861160 -- newly created network has no uuid
+Subject: [PATCH] Fix lp:861160 -- newly created network has no uuid
Implemented code review changes.
Fixed issue causing pep8 build failure.
@@ -16,10 +16,10 @@ Change-Id: If2cc0e23be8d4e1558a10fa86e6ba4cdec61b7d1
3 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/Authors b/Authors
-index cedd199..bff7d14 100644
+index b83f951..119fd0a 100644
--- a/Authors
+++ b/Authors
-@@ -117,6 +117,7 @@ Todd Willey <todd at ansolabs.com>
+@@ -119,6 +119,7 @@ Todd Willey <todd at ansolabs.com>
Trey Morris <trey.morris at rackspace.com>
Troy Toman <troy.toman at rackspace.com>
Tushar Patil <tushar.vitthal.patil at gmail.com>
@@ -28,10 +28,10 @@ index cedd199..bff7d14 100644
Vishvananda Ishaya <vishvananda at gmail.com>
Vivek Y S <vivek.ys at gmail.com>
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
-index 6cc678a..3fcba4c 100644
+index 665bdc1..23c0408 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
-@@ -1754,6 +1754,7 @@ def network_count_reserved_ips(context, network_id):
+@@ -1764,6 +1764,7 @@ def network_count_reserved_ips(context, network_id):
@require_admin_context
def network_create_safe(context, values):
network_ref = models.Network()
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 c40c456..a45fe7f 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 594276442c5666101270b71a26c1921e4d73c7f3 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/95] Fix KeyError when passed unknown format of time
+Subject: [PATCH] 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 f76ffab..3fc8f9a 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 df042f7802370de4490d9130a39eaec792725565 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/95] Add local storage of context for logging
+Subject: [PATCH] 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 1009ac4..0bb4a12 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 8607a15aba0b9f610efa69cc74fa4a178fd2f8ce 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/95] Bug 884863: nova logs everything to syslog twice
+Subject: [PATCH] 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
@@ -21,10 +21,10 @@ Change-Id: I59ad61751e1a19d2cbb73dc1deea9c708d4c5032
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/nova/log.py b/nova/log.py
-index 1e04f75..ec3fa67 100644
+index 86f1570..23b83ab 100644
--- a/nova/log.py
+++ b/nova/log.py
-@@ -245,11 +245,12 @@ class NovaRootLogger(NovaLogger):
+@@ -249,11 +249,12 @@ class NovaRootLogger(NovaLogger):
def setup_from_flags(self):
"""Setup logger from flags."""
global _filelog
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 d951a6d..86b92e9 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,8 +1,7 @@
-From 9a00aea7fc49522ab8628383e8a3fde3f0aa83db Mon Sep 17 00:00:00 2001
+From 767c9249bcd46937492036d535714daf5b0813a2 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/95] Bug #884534: nova-ajax-console-proxy crashes on
- shutdown
+Subject: [PATCH] Bug #884534: nova-ajax-console-proxy crashes on shutdown
Close the correct connection, when shutting down. self is not defined in
this context.
diff --git a/0049-exception.KeypairNotFound-usage-correction.patch b/0049-exception.KeypairNotFound-usage-correction.patch
index 0c85ac8..e0d1ce1 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 953caf74096638cec00dd284fd58b07da269992a 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/95] exception.KeypairNotFound usage correction
+Subject: [PATCH] exception.KeypairNotFound usage correction
Fixes bug 885462
diff --git a/0050-fix-bug-816630.patch b/0050-fix-bug-816630.patch
index df47f88..e012dcd 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 e46bbf831f4d12408be07109039c3a2ea1ff982d 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/95] fix bug 816630
+Subject: [PATCH] fix bug 816630
Off by one error fixed
With test case
@@ -15,11 +15,11 @@ Change-Id: I5060c0a59949d69d6f859a01e7cf5fa8e0227d8a
2 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/nova/network/manager.py b/nova/network/manager.py
-index d8de396..a154441 100644
+index cab6f88..c6155f2 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
-@@ -837,7 +837,7 @@ class NetworkManager(manager.SchedulerDependentManager):
- num_ips = len(project_net)
+@@ -841,7 +841,7 @@ class NetworkManager(manager.SchedulerDependentManager):
+ ips = []
for index in range(num_ips):
address = str(project_net[index])
- if index < bottom_reserved or num_ips - index < top_reserved:
@@ -28,7 +28,7 @@ index d8de396..a154441 100644
else:
reserved = False
diff --git a/nova/tests/test_network.py b/nova/tests/test_network.py
-index 844aba2..6ae8884 100644
+index 40efd4f..dbf934e 100644
--- a/nova/tests/test_network.py
+++ b/nova/tests/test_network.py
@@ -210,6 +210,17 @@ class FlatNetworkTestCase(test.TestCase):
diff --git a/0051-Log-the-exception-when-we-get-one.patch b/0051-Log-the-exception-when-we-get-one.patch
index 86a6c64..f02d3e4 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 137a3ed5da93a5ed8ff7970b5785811cd4ea330d 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/95] Log the exception when we get one.
+Subject: [PATCH] Log the exception when we get one.
(cherry picked from commit 46152102a0f5900e1a2cc0800ec850aa7191a3d6)
@@ -11,7 +11,7 @@ Change-Id: Iee478c8f300b608dd153e3400bd17866f52543c5
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy
-index 23fb42f..5546e37 100755
+index 4770a8a..3b03fdc 100755
--- a/bin/nova-ajax-console-proxy
+++ b/bin/nova-ajax-console-proxy
@@ -102,7 +102,8 @@ class AjaxConsoleProxy(object):
diff --git a/0052-Change-floating-snat-to-float-snat.patch b/0052-Change-floating-snat-to-float-snat.patch
index 7dee12d..ba25d48 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 31ba163efd5831eb9cd337b0d6cb222b1cb19c2d 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/95] Change floating-snat to float-snat
+Subject: [PATCH] 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 46b4576..3269a91 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 be257ce9e7bbb524fe23510de62ea66474c62681 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/95] Fix for launchpad bug #882568
+Subject: [PATCH] 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 9980e73..66009a7 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 7667b2af26c06d78ecc89efa92036217d690d46c 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/95] Undefine libvirt saved instances
+Subject: [PATCH] Undefine libvirt saved instances
Fixes bug 814561
@@ -22,10 +22,10 @@ Change-Id: I760a15d2ab135d7c3d638ca3c4358d8600582411
3 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/Authors b/Authors
-index cedd199..f8aa25e 100644
+index 119fd0a..08403b8 100644
--- a/Authors
+++ b/Authors
-@@ -31,6 +31,7 @@ Dave Walker <DaveWalker at ubuntu.com>
+@@ -32,6 +32,7 @@ Dave Walker <DaveWalker at ubuntu.com>
David Pravec <David.Pravec at danix.org>
David Subiros <david.perez5 at hp.com>
Dean Troyer <dtroyer at gmail.com>
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 bbcd239..1fa31e0 100644
--- a/0055-Log-original-dropped-exception-when-a-new-exception-.patch
+++ b/0055-Log-original-dropped-exception-when-a-new-exception-.patch
@@ -1,8 +1,7 @@
-From f286a4b29d4386f8fe93f9c58fe1486f859c1317 Mon Sep 17 00:00:00 2001
+From 83646d007ea6eaa414d8f86f277af831b4bfa054 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/95] Log original dropped exception when a new exception
- occurs
+Subject: [PATCH] Log original dropped exception when a new exception occurs
If a exception is caught while processing a previous exception, make sure
to log it so it doesn't silently get discarded
@@ -39,7 +38,7 @@ index 5feb840..69dea2e 100644
@exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
def run_instance(self, context, instance_id, **kwargs):
diff --git a/nova/exception.py b/nova/exception.py
-index b88e8e5..a3992d2 100644
+index b98219c..50477af 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -92,6 +92,8 @@ def wrap_exception(notifier=None, publisher_id=None, event_type=None,
diff --git a/0056-Fix-exception-reraising-in-volume-manager.patch b/0056-Fix-exception-reraising-in-volume-manager.patch
index a5925ba..b92b2fb 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 08f26553aed1d1d89154e3e738ce69d89c6f0f5a 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/95] Fix exception reraising in volume manager.
+Subject: [PATCH] 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 94f660b..99970d4 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 0fe3b79461ee05ec67d2bd824a379c77fdf30ce5 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/95] Make run instances respect availability zone
+Subject: [PATCH] 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 6dfc55c..aae9184 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 c5a13de64e6d67fa7a41ce48e3e1be31d283b45e 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/95] Makes rpc_allocate_fixed_ip return properly
+Subject: [PATCH] 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 d015547..4cfc2a7 100644
--- a/0059-Update-exception.wrap_exception-so-that-all-exceptio.patch
+++ b/0059-Update-exception.wrap_exception-so-that-all-exceptio.patch
@@ -1,9 +1,8 @@
-From d05c2e6d33f40dac1aa373fcceb819d97d9e3467 Mon Sep 17 00:00:00 2001
+From 983e165024db2db88ff92f46bfdd921c7e8d9128 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/95] Update exception.wrap_exception so that all exceptions
- (not just Error and NovaException types) get logged
- correctly.
+Subject: [PATCH] Update exception.wrap_exception so that all exceptions (not
+ just Error and NovaException types) get logged correctly.
(cherry picked from commit 19b3b7a0c50dd6a68238daf8827519fd83a395cc)
diff --git a/0060-Move-failed-instances-to-error-state.patch b/0060-Move-failed-instances-to-error-state.patch
index 85cafb1..4a4cf3e 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 d9f24f2783edfda3ac26f22cef7ae7d8407f383a 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/95] Move failed instances to error state
+Subject: [PATCH] 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 2740e2f..d31ea4a 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 1c38d199adfb7ae3e1934ee6b3b7ffc68ce03679 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/95] Fixes LP878319
+Subject: [PATCH] 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 e5091ce..93ab4bd 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 355290bfe429c66cd18c2bdd245ae3021d1e2f48 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/95] Fixes bug 871877
+Subject: [PATCH] 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 6621ce6..7a1d952 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,8 +1,8 @@
-From 39fdf335961f19903f87a4d09fd49a777c9838f2 Mon Sep 17 00:00:00 2001
+From c11008008631bd3428e5c413ea461b4b132274c8 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/95] nova-manage: exit with status 1 if an image
- registration fails
+Subject: [PATCH] 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 8143e72..f1d3979 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 41d85b5893e650b40480b9535b24f2f9e3f53e6f 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/95] Fix a notification bug when creating instances
+Subject: [PATCH] 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
@@ -17,11 +17,11 @@ Change-Id: I70fbf3c67407c67b69040ee481ca6d51212cc55d
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
-index 69dea2e..5203fc3 100644
+index 1196d98..b926eac 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
-@@ -445,12 +445,12 @@ class ComputeManager(manager.SchedulerDependentManager):
- return
+@@ -459,12 +459,12 @@ class ComputeManager(manager.SchedulerDependentManager):
+ network_info, block_device_info)
current_power_state = self._get_power_state(context, instance)
- self._instance_update(context,
@@ -40,10 +40,10 @@ index 69dea2e..5203fc3 100644
usage_info = utils.usage_from_instance(instance)
notifier.notify('compute.%s' % self.host,
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
-index 67dbe5e..a791d52 100644
+index d32c5df..c6747d0 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
-@@ -431,6 +431,7 @@ class ComputeTestCase(test.TestCase):
+@@ -435,6 +435,7 @@ class ComputeTestCase(test.TestCase):
self.assertTrue('display_name' in payload)
self.assertTrue('created_at' in payload)
self.assertTrue('launched_at' in payload)
diff --git a/0065-fix-rebuild-sha1-not-string-error.patch b/0065-fix-rebuild-sha1-not-string-error.patch
index ff725e0..5e690d3 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 bd5a96868635e35b8a462d9b4172de597c83886d 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/95] fix rebuild sha1 not string error
+Subject: [PATCH] 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 2ef4a4b..8494a10 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 9abbfd0f77433da57e973bd6bd500e8e176021cf 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/95] Verify security group parameters
+Subject: [PATCH] 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
@@ -178,10 +178,10 @@ index 1fd64f3..e8f1f2c 100644
values['protocol'] = ip_protocol
values['from_port'] = from_port
diff --git a/nova/exception.py b/nova/exception.py
-index 50477af..2e7fb70 100644
+index 7b1531b..2c8b9ba 100644
--- a/nova/exception.py
+++ b/nova/exception.py
-@@ -217,7 +217,7 @@ class InvalidVolumeType(Invalid):
+@@ -210,7 +210,7 @@ class InvalidVolumeType(Invalid):
class InvalidPortRange(Invalid):
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 94276cd..60a952f 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 48058f6252f9bcc61a3c1e3463aa7d098a9a841e 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/95] Bug #886353: Faults raised by OpenStack API Resource
+Subject: [PATCH] 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 4037ede..1e2c0cc 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 fc7334078d09c4d1a19884ee6667c7fe4fa351ee 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/95] Makes sure gateways forward properly
+Subject: [PATCH] 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 4efd5d5..43ee676 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 f5d0764d3afa18aa110579a7e91cd18312cb22de 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/95] Fix a minor memory leak
+Subject: [PATCH] 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 4b97fd0..ded1d4a 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 e2f06bbfe2b3214390567d7c3667cf6eb1f717e6 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/95] Fixes bug 886263.
+Subject: [PATCH] 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 c33b4dc..61253f8 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 439dd258bb85c6edf37f6dc55b4d27f4bdc9b04c 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/95] Fix for bug 894431
+Subject: [PATCH] Fix for bug 894431
Make sure we set the correct interface id
@@ -13,10 +13,10 @@ Change-Id: I427284182cc0a5a456b43b777faba0a74f3816e7
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
-index a55ba2c..e685b4b 100755
+index 2d011dd..a6aea8a 100755
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
-@@ -993,7 +993,7 @@ class LinuxOVSInterfaceDriver(LinuxNetInterfaceDriver):
+@@ -995,7 +995,7 @@ class LinuxOVSInterfaceDriver(LinuxNetInterfaceDriver):
'--', '--may-exist', 'add-port', bridge, dev,
'--', 'set', 'Interface', dev, "type=internal",
'--', 'set', 'Interface', dev,
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 194984a..6b4ef84 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,8 +1,8 @@
-From c733462b229290210d6249e0f8fc7d2beaab9091 Mon Sep 17 00:00:00 2001
+From 9ddcfaf41859132be41c463bb643a285cb783f46 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/95] Bug #897091: "nova actions" fails with HTTP 400 /
- TypeError if a server action has been performed
+Subject: [PATCH] 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
actions method with a dictionary. This meant that 'nova actions' would fail
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 71db7da..97fa335 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 2fac129efefd7dbd416bef57fe5f86f848b521e7 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/95] removed logic of throwing exception if no floating ip
+Subject: [PATCH] removed logic of throwing exception if no floating ip
fixes 897089
@@ -61,10 +61,10 @@ index 23c0408..6108585 100644
@require_context
diff --git a/nova/exception.py b/nova/exception.py
-index 50477af..2db2e2b 100644
+index 2c8b9ba..466bfff 100644
--- a/nova/exception.py
+++ b/nova/exception.py
-@@ -536,10 +536,6 @@ class FloatingIpNotFoundForAddress(FloatingIpNotFound):
+@@ -529,10 +529,6 @@ class FloatingIpNotFoundForAddress(FloatingIpNotFound):
message = _("Floating ip not found for address %(address)s.")
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 0d24ef8..75491d4 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 7494fe4634fef0f7ff29243970d4e3ce76a3b70b 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/95] Fix RPC responses to allow None response correctly.
+Subject: [PATCH] Fix RPC responses to allow None response correctly.
Fixes bug 897155
@@ -181,7 +181,7 @@ index 303a4ff..57fd074 100644
diff --git a/nova/rpc/impl_kombu.py b/nova/rpc/impl_kombu.py
-index b994a6a..41e8ff5 100644
+index cc1c864..3667752 100644
--- a/nova/rpc/impl_kombu.py
+++ b/nova/rpc/impl_kombu.py
@@ -625,7 +625,7 @@ class ProxyCallback(object):
@@ -217,9 +217,9 @@ index b994a6a..41e8ff5 100644
+ if self._done:
+ return
self._done = True
- self._connection.close()
-
-@@ -688,6 +693,8 @@ class MulticallWaiter(object):
+ self._iterator.close()
+ self._iterator = None
+@@ -690,6 +695,8 @@ class MulticallWaiter(object):
"""The consume() callback will call this. Store the result."""
if data['failure']:
self._result = RemoteError(*data['failure'])
@@ -228,7 +228,7 @@ index b994a6a..41e8ff5 100644
else:
self._result = data['result']
-@@ -697,13 +704,13 @@ class MulticallWaiter(object):
+@@ -699,13 +706,13 @@ class MulticallWaiter(object):
raise StopIteration
while True:
self._iterator.next()
@@ -245,7 +245,7 @@ index b994a6a..41e8ff5 100644
yield result
-@@ -758,7 +765,7 @@ def fanout_cast(context, topic, msg):
+@@ -760,7 +767,7 @@ def fanout_cast(context, topic, msg):
conn.fanout_send(topic, msg)
@@ -254,7 +254,7 @@ index b994a6a..41e8ff5 100644
"""Sends a reply or an error on the channel signified by msg_id.
Failure should be a sys.exc_info() tuple.
-@@ -778,4 +785,6 @@ def msg_reply(msg_id, reply=None, failure=None):
+@@ -780,4 +787,6 @@ def msg_reply(msg_id, reply=None, failure=None):
msg = {'result': dict((k, repr(v))
for k, v in reply.__dict__.iteritems()),
'failure': failure}
diff --git a/0075-Sanitize-EC2-manifests-and-image-tarballs.patch b/0075-Sanitize-EC2-manifests-and-image-tarballs.patch
index 456f746..2aab8f3 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 10cb91d1e3a42460c8cb286acbdef4eb51c6d298 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/95] Sanitize EC2 manifests and image tarballs
+Subject: [PATCH] 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 39150f2..62d59ea 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 5ac2c16c95c662b4840c18c7c5ccf09eaee35c1f 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/95] Rename .nova-venv to .venv.
+Subject: [PATCH] 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
@@ -28,31 +28,13 @@ Change-Id: Ieaf1dac3207ecb34b911c7edcd2086809abdf49e
diff --git a/.gitignore b/.gitignore
index 2afc7a3..8bc8497 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -10,3 +10,4 @@ build/*
- build-stamp
- nova.egg-info
- .nova-venv
-+.venv
diff --git a/.mailmap b/.mailmap
index f2f59d8..9b6127c 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -22,6 +22,8 @@
- <jake at ansolabs.com> <jake at markupisart.com>
- <jake at ansolabs.com> <admin at jakedahn.com>
- <jaypipes at gmail.com> <jpipes at serialcoder>
-+<jeblair at hp.com> <james.blair at rackspace.com>
-+<jeblair at hp.com> <corvus at inaugust.com>
- <jmckenty at gmail.com> <jmckenty at joshua-mckentys-macbook-pro.local>
- <jmckenty at gmail.com> <jmckenty at yyj-dhcp171.corp.flock.com>
- <jmckenty at gmail.com> <joshua.mckenty at nasa.gov>
diff --git a/Authors b/Authors
-index 08403b8..9cb7ba8 100644
+index ab90964..657b95d 100644
--- a/Authors
+++ b/Authors
-@@ -48,7 +48,7 @@ Hisaki Ohara <hisaki.ohara at intel.com>
+@@ -49,7 +49,7 @@ Hisaki Ohara <hisaki.ohara at intel.com>
Ilya Alekseyev <ilyaalekseyev at acm.org>
Isaku Yamahata <yamahata at valinux.co.jp>
Jake Dahn <jake at ansolabs.com>
diff --git a/0077-Fix-issue-in-test_s3_malicious_tarballs.patch b/0077-Fix-issue-in-test_s3_malicious_tarballs.patch
index fd717e8..bb14a79 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 70f985d5515081968598f5e58f4b5aa3e3b994f6 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/95] Fix issue in test_s3_malicious_tarballs
+Subject: [PATCH] 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 459fd39..c23dcad 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 1f59e8d73e06fbae6b2512be48a2f26f8bc50032 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/95] Fixes bug 888649
+Subject: [PATCH] Fixes bug 888649
Change exception.VolumeIsBusy to derive from NovaException instead of
Error, so that an 'unexpected keyword' exception is not thrown when
@@ -23,10 +23,10 @@ Change-Id: I15464cb0cf72a2c71f430e4c8c5c2b27cd4e2ef9
3 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/Authors b/Authors
-index 9cb7ba8..4943767 100644
+index 657b95d..a9266b2 100644
--- a/Authors
+++ b/Authors
-@@ -99,6 +99,7 @@ Nachi Ueno <ueno.nachi at lab.ntt.co.jp>
+@@ -100,6 +100,7 @@ Nachi Ueno <ueno.nachi at lab.ntt.co.jp>
Naveed Massjouni <naveedm9 at gmail.com>
Nikolay Sokolov <nsokolov at griddynamics.com>
Nirmal Ranganathan <nirmal.ranganathan at rackspace.com>
@@ -35,10 +35,10 @@ index 9cb7ba8..4943767 100644
Renuka Apte <renuka.apte at citrix.com>
Ricardo Carrillo Cruz <emaildericky at gmail.com>
diff --git a/nova/exception.py b/nova/exception.py
-index 50477af..688f554 100644
+index 466bfff..c2a98eb 100644
--- a/nova/exception.py
+++ b/nova/exception.py
-@@ -384,7 +384,7 @@ class SnapshotNotFound(NotFound):
+@@ -377,7 +377,7 @@ class SnapshotNotFound(NotFound):
message = _("Snapshot %(snapshot_id)s could not be found.")
diff --git a/0079-Fixes-bug-767947.patch b/0079-Fixes-bug-767947.patch
index 4cf8de0..dc7b75d 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 795568953b22ad9b649888438b31f04d0a2bb186 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/95] Fixes bug 767947
+Subject: [PATCH] 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.
@@ -10,28 +10,15 @@ domain libvirt.VIR_FROM_RPC when trying to use the existing connection.
Change-Id: Ib3d4ff23aadf5a0c93dde0c37c5686bf404ce9de
---
- Authors | 1 +
nova/tests/test_libvirt.py | 28 ++++++++++++++++++++++++++++
nova/virt/libvirt/connection.py | 3 ++-
- 3 files changed, 31 insertions(+), 1 deletions(-)
+ 2 files changed, 30 insertions(+), 1 deletions(-)
-diff --git a/Authors b/Authors
-index 08403b8..ab90964 100644
---- a/Authors
-+++ b/Authors
-@@ -4,6 +4,7 @@ Adam Johnson <adjohn at gmail.com>
- Ahmad Hassan <ahmad.hassan at hp.com>
- Alex Meade <alex.meade at rackspace.com>
- Alexander Sakhnov <asakhnov at mirantis.com>
-+Alvaro Lopez Garcia <aloga at ifca.unican.es>
- Andrey Brindeyev <abrindeyev at griddynamics.com>
- Andy Smith <code at term.ie>
- Andy Southgate <andy.southgate at citrix.com>
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
-index f59b2f7..e3e6b75 100644
+index b44bde2..f268587 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
-@@ -951,6 +951,34 @@ class LibvirtConnTestCase(test.TestCase):
+@@ -957,6 +957,34 @@ class LibvirtConnTestCase(test.TestCase):
ip = conn.get_host_ip_addr()
self.assertEquals(ip, FLAGS.my_ip)
@@ -67,7 +54,7 @@ index f59b2f7..e3e6b75 100644
conn = connection.LibvirtConnection(False)
swap = {'device_name': '/dev/sdb',
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
-index ba1dc86..5237285 100644
+index 333ae49..36938bf 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -203,7 +203,8 @@ class LibvirtConnection(driver.ComputeDriver):
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 8ea17ba..76e3dcd 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 ef7ffa54c68ce7eee4b72226246004756b2d12de 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/95] Add Support to delete VMs in error state.
+Subject: [PATCH] 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 becac51..07a6ab1 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 06de86a5f213f6bd2374e8a7ceed974a0730490f 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/95] Fix to correctly report memory on Linux 3.X.
+Subject: [PATCH] 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 28c150b..a505278 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 a07ac3774146d7e2c1e300e6300a6f079e5bd313 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/95] avoid error and trace on dom.vcpus() in lxc
+Subject: [PATCH] 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().
@@ -12,7 +12,7 @@ Change-Id: I8ff4e973d33eef3df116feb237b2febc8e6a59b5
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
-index 36938bf..d2735ea 100644
+index 333d0cd..55cb31d 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -1379,7 +1379,13 @@ class LibvirtConnection(driver.ComputeDriver):
diff --git a/0083-Bug-751229-Floating-address-range-fixed.patch b/0083-Bug-751229-Floating-address-range-fixed.patch
index 52afbb8..64f47fd 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 1e8515bc889bb242e8d20b034b0dc4a842771719 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/95] Bug 751229: Floating address range fixed
+Subject: [PATCH] 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 a9ff291..aeedd4f 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,29 +1,16 @@
-From fc37582812747887ebcce766fd80541da98c3b43 Mon Sep 17 00:00:00 2001
+From cdb944ce4e4a8df8b0eb0184bf55075464b054b2 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/95] Bug 820059: bin/nova-manage.py VpnCommands.spawn calls
+Subject: [PATCH] Bug 820059: bin/nova-manage.py VpnCommands.spawn calls
non-existant method VpnCommands._vpn_for - fixed
Change-Id: I86c509d98fac685a5d658f397d0672f71b4bc175
---
- Authors | 1 +
bin/nova-manage | 7 ++++++-
- 2 files changed, 7 insertions(+), 1 deletions(-)
+ 1 files changed, 6 insertions(+), 1 deletions(-)
-diff --git a/Authors b/Authors
-index a9266b2..9c0f5c5 100644
---- a/Authors
-+++ b/Authors
-@@ -48,6 +48,7 @@ Hisaharu Ishii <ishii.hisaharu at lab.ntt.co.jp>
- Hisaki Ohara <hisaki.ohara at intel.com>
- Ilya Alekseyev <ilyaalekseyev at acm.org>
- Isaku Yamahata <yamahata at valinux.co.jp>
-+Ivan Kolodyazhny <e0ne at e0ne.info>
- Jake Dahn <jake at ansolabs.com>
- James E. Blair <jeblair at hp.com>
- Jason Cannavale <jason.cannavale at rackspace.com>
diff --git a/bin/nova-manage b/bin/nova-manage
-index 3ff73f1..fb6f7bd 100755
+index 45d649e..f3aff19 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -88,6 +88,7 @@ from nova import rpc
diff --git a/0085-Pass-r-option-to-collie-cluster-status.patch b/0085-Pass-r-option-to-collie-cluster-status.patch
index bcbe3e4..7339ddf 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 cf9ece2b61ef7ffe50d22fb46c87edc0cb423319 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/95] Pass '-r' option to 'collie cluster status'.
+Subject: [PATCH] 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
@@ -14,7 +14,7 @@ Change-Id: Ie31bdded928772250515e439016fc5c5beb00d83
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/Authors b/Authors
-index a9266b2..cc9683b 100644
+index 9c0f5c5..c8d3d54 100644
--- a/Authors
+++ b/Authors
@@ -43,6 +43,7 @@ Eldar Nugaev <reldan at oscloud.ru>
diff --git a/0086-Fixing-snapshot-failure-task_state.patch b/0086-Fixing-snapshot-failure-task_state.patch
index 4314617..52e7189 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 bdcc6e61846fd3f9d247206bc7ea67e8dd361fe6 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/95] Fixing snapshot failure task_state
+Subject: [PATCH] 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 ea08d40..24d5a17 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,8 +1,7 @@
-From 8be66ace12f3af6bbc7cdbe651a78fd9ab363eeb Mon Sep 17 00:00:00 2001
+From de13d079a18c87cdaa9359ca0f02df3543db60bb 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/95] Add INPUT chain rule for EC2 metadata requests
- (lp:856385)
+Subject: [PATCH] Add INPUT chain rule for EC2 metadata requests (lp:856385)
On Fedora, the default policy for the INPUT chain in the filter table
is DROP. This means that EC2 metadata requests from guests get dropped.
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 9884f1b..7a79863 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 3ddbd984e5eed77ab269a9e10f06cee88203a9e2 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/95] Have nova-api add the INPUT rule for EC2 metadata
+Subject: [PATCH] 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 70029db..f2cca0e 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,8 +1,7 @@
-From 8593b6efeb2650c4630f86caff9008c5360b0ad4 Mon Sep 17 00:00:00 2001
+From 199969c24384c88fabc3603b7328aa932826e570 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/95] Allow the user to choose either ietadm or tgtadm
- (lp:819997)
+Subject: [PATCH] Allow the user to choose either ietadm or tgtadm (lp:819997)
(Actually authored by Chuck Short <zulcss at ubuntu.com> but Gerrit won't
allow me to push it with Author: set to that)
diff --git a/0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch b/0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
index 524cb6b..7f4117b 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 8fc8b08654097bc80b4790e7d58ad63822b12b63 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/95] Remove VolumeDriver.sync_exec method (lp:819997)
+Subject: [PATCH] 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 3caf22f..3651686 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 4260879ccb158a64911a48362b546a2b53f7cf23 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/95] Refactor ietadm/tgtadm calls out into helper classes
+Subject: [PATCH] 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
index 1ce0f76..c69e0b6 100644
--- a/0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
+++ b/0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
@@ -1,7 +1,7 @@
-From c0804a0656cf8b1e36164bac0d4462bc50090967 Mon Sep 17 00:00:00 2001
+From 224073ac93267e5117c6e4e60610e75a36777e5e 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
+Subject: [PATCH] Fix tgtadm off by one error. Fixes bug #871278
(cherry picked from commit 15cc877cc2af71135b896974f17cb4a63291a08c)
diff --git a/0093-Bug-898257-abstract-out-disk-image-access-methods.patch b/0093-Bug-898257-abstract-out-disk-image-access-methods.patch
index 3a6ec81..b7c3b44 100644
--- a/0093-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 a905d77d8dcf1e90c7a55a5823853bddcc904c67 Mon Sep 17 00:00:00 2001
+From df4e5ff5e959b37e8fa30b9830a53a47aa650eda 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/95] Bug#898257 abstract out disk image access methods
+Subject: [PATCH] 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/0094-Bug-898257-support-handling-images-with-libguestfs.patch b/0094-Bug-898257-support-handling-images-with-libguestfs.patch
index 1709913..dea1ba7 100644
--- a/0094-Bug-898257-support-handling-images-with-libguestfs.patch
+++ b/0094-Bug-898257-support-handling-images-with-libguestfs.patch
@@ -1,7 +1,7 @@
-From 9694e31bc3bccbdcdc78b32820600df4b3c0b08f Mon Sep 17 00:00:00 2001
+From cd01dc63868c61ebdc209c574fa67825d32ad98a 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 94/95] Bug#898257 support handling images with libguestfs
+Subject: [PATCH] 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/0095-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0095-Ensure-we-don-t-access-the-net-when-building-docs.patch
index ee44704..ce39971 100644
--- a/0095-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 64fbfc014bc9cb0d48b1a0c6e616c275b277e66c Mon Sep 17 00:00:00 2001
+From b5a1727b4dc5ee96e8608c7496044fad00603f9f 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 95/95] Ensure we don't access the net when building docs
+Subject: [PATCH] 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 32b1a4e..791cc6b 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
Name: openstack-nova
Version: 2011.3
-Release: 17%{?dist}
+Release: 18%{?dist}
Summary: OpenStack Compute (nova)
Group: Applications/System
@@ -30,7 +30,8 @@ Source23: openstack-nova-db-setup
#
# Patches managed here: https://github.com/markmc/nova/tree/fedora-patches
#
-# $> git format-patch 2011.3
+# $> git format-patch -N 2011.3
+# $> 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
#
@@ -550,6 +551,9 @@ fi
%endif
%changelog
+* Fri Jan 6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-18
+- Fix up recent patches which don't apply
+
* Fri Jan 6 2012 Mark McLoughlin <markmc at redhat.com> - 2011.3-17
- Backport tgtadm off-by-one fix from upstream (#752709)
More information about the scm-commits
mailing list