[openstack-nova/el6: 5/5] Merge branch 'f16' into el6
Mark McLoughlin
markmc at fedoraproject.org
Fri Jan 6 13:52:45 UTC 2012
commit 0a54ca374e5fbcd43216183e847ebfdb82058f72
Merge: 5f86913 be33b4d
Author: Mark McLoughlin <markmc at redhat.com>
Date: Fri Jan 6 13:52:26 2012 +0000
Merge branch 'f16' into el6
0001-Add-tools-rfc.sh-from-master.patch | 6 +-
0002-Don-t-use-GitPython-for-authors-check.patch | 6 +-
...Made-jenkins-email-pruning-more-resilient.patch | 6 +-
0004-Removing-old-code-that-snuck-back-in.patch | 6 +-
...outstanding-pep8-errors-for-a-clean-trunk.patch | 6 +-
0006-Point-tools-rfc.sh-at-the-right-branch.patch | 6 +-
...kes-sure-to-recreate-gateway-for-moved-ip.patch | 6 +-
...y-qualified-domain-name-in-local-hostname.patch | 6 +-
...e-grantee-group-loading-for-source-groups.patch | 6 +-
...ders-when-auth_token-is-None.-Fixes-bug-8.patch | 7 +-
...pool-complexities-from-nova.db.sqlalchemy.patch | 6 +-
0012-Raise-InsufficientFreeMemory.patch | 6 +-
0013-Don-t-leak-exceptions-out-to-users.patch | 6 +-
...snapshots-work-for-amis.-Fixes-bug-873156.patch | 6 +-
0015-Add-missing-author.patch | 6 +-
0016-Make-snapshots-private-by-default.patch | 6 +-
...ackups-can-no-longer-happen-simultaneousl.patch | 8 +-
0018-Fixed-bug-lp850602.patch | 24 +-
0019-bug-861310.patch | 6 +-
0020-Enforce-snapshot-cleanup.patch | 10 +-
0021-bug-lp845714.patch | 6 +-
...-version-specifier-to-kombu-in-pip-requir.patch | 8 +-
...nant-id-to-the-create-images-response-Loc.patch | 8 +-
...-bug-862633-OS-api-consoles-create-broken.patch | 6 +-
0025-Deallocate-ip-if-build-fails.patch | 6 +-
...p-returning-correct-password-on-api-calls.patch | 6 +-
0027-Handle-pidfile-exception-for-dnsmasq.patch | 6 +-
0028-Make-sure-unknown-extensions-return-404.patch | 6 +-
...ginal-exception-in-ClassNotFound-exceptio.patch | 6 +-
...default-FLAGS.logfile_mode-is-properly-co.patch | 8 +-
...t-errors-on-confirm-revertResize-failures.patch | 6 +-
...ds-ext4-and-reiserfs-to-_mount_filesystem.patch | 6 +-
0033-Improve-access-check-on-images.patch | 6 +-
...es-bug-834633-Auto-assigning-floating-IPs.patch | 6 +-
0035-fixes-bug-883233.patch | 8 +-
...x-deletion-of-instances-without-fixed-ips.patch | 101 ++++++
...njection-for-OSAPI-rebuilds.-Fixes-881649.patch | 72 +++++
0038-Add-.gitreview-config-file-for-gerrit.patch | 48 +++
...ulk-create-fixed-ips.-The-true-issue-here.patch | 98 ++++++
0040-Retry-failed-SQL-connections-LP-876663.patch | 68 ++++
...-NoAuth-to-account-for-requests-ending-in.patch | 43 +++
...etworks-returned-from-get_instance_nw_inf.patch | 61 ++++
...ajax_console_proxy_port-needs-to-be-an-in.patch | 30 ++
...-861160-newly-created-network-has-no-uuid.patch | 61 ++++
...yError-when-passed-unknown-format-of-time.patch | 32 ++
...-Add-local-storage-of-context-for-logging.patch | 122 ++++++++
...4863-nova-logs-everything-to-syslog-twice.patch | 44 +++
...nova-ajax-console-proxy-crashes-on-shutdo.patch | 28 ++
...xception.KeypairNotFound-usage-correction.patch | 30 ++
0050-fix-bug-816630.patch | 54 ++++
0051-Log-the-exception-when-we-get-one.patch | 29 ++
0052-Change-floating-snat-to-float-snat.patch | 46 +++
0053-Fix-for-launchpad-bug-882568.patch | 41 +++
0054-Undefine-libvirt-saved-instances.patch | 93 ++++++
...l-dropped-exception-when-a-new-exception-.patch | 95 ++++++
...Fix-exception-reraising-in-volume-manager.patch | 78 +++++
...e-run-instances-respect-availability-zone.patch | 78 +++++
...kes-rpc_allocate_fixed_ip-return-properly.patch | 74 +++++
...ption.wrap_exception-so-that-all-exceptio.patch | 65 ++++
0060-Move-failed-instances-to-error-state.patch | 186 +++++++++++
0061-Fixes-LP878319.patch | 152 +++++++++
0062-Fixes-bug-871877.patch | 76 +++++
...-exit-with-status-1-if-an-image-registrat.patch | 32 ++
...-notification-bug-when-creating-instances.patch | 56 ++++
0065-fix-rebuild-sha1-not-string-error.patch | 61 ++++
0066-Verify-security-group-parameters.patch | 307 +++++++++++++++++++
...Faults-raised-by-OpenStack-API-Resource-h.patch | 35 +++
0068-Makes-sure-gateways-forward-properly.patch | 111 +++++++
0069-Fix-a-minor-memory-leak.patch | 31 ++
0070-Fixes-bug-886263.patch | 30 ++
0071-Fix-for-bug-894431.patch | 30 ++
...nova-actions-fails-with-HTTP-400-TypeErro.patch | 119 +++++++
...ic-of-throwing-exception-if-no-floating-i.patch | 80 +++++
...esponses-to-allow-None-response-correctly.patch | 322 ++++++++++++++++++++
...Sanitize-EC2-manifests-and-image-tarballs.patch | 4 +-
0076-Rename-.nova-venv-to-.venv.patch | 110 +++++++
0077-Fix-issue-in-test_s3_malicious_tarballs.patch | 29 ++
0078-Fixes-bug-888649.patch | 91 ++++++
0079-Fixes-bug-767947.patch | 72 +++++
...-Add-Support-to-delete-VMs-in-error-state.patch | 27 ++
...x-to-correctly-report-memory-on-Linux-3.X.patch | 38 +++
...avoid-error-and-trace-on-dom.vcpus-in-lxc.patch | 35 +++
0083-Bug-751229-Floating-address-range-fixed.patch | 43 +++
...bin-nova-manage.py-VpnCommands.spawn-call.patch | 47 +++
0085-Pass-r-option-to-collie-cluster-status.patch | 47 +++
0086-Fixing-snapshot-failure-task_state.patch | 73 +++++
...hain-rule-for-EC2-metadata-requests-lp-85.patch | 9 +-
...pi-add-the-INPUT-rule-for-EC2-metadata-lp.patch | 12 +-
...ser-to-choose-either-ietadm-or-tgtadm-lp-.patch | 17 +-
...e-VolumeDriver.sync_exec-method-lp-819997.patch | 20 +-
...tadm-tgtadm-calls-out-into-helper-classes.patch | 16 +-
...tgtadm-off-by-one-error.-Fixes-bug-871278.patch | 38 +++
...57-abstract-out-disk-image-access-methods.patch | 20 +-
...7-support-handling-images-with-libguestfs.patch | 6 +-
...e-don-t-access-the-net-when-building-docs.patch | 28 ++
openstack-nova-nonet.patch | 11 -
openstack-nova.spec | 163 +++++++++--
97 files changed, 4109 insertions(+), 209 deletions(-)
---
diff --cc openstack-nova.spec
index 5f9f420,791cc6b..9e5f286
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@@ -69,21 -72,71 +72,74 @@@ Patch32: 0032-Adds-ext4-and-re
Patch33: 0033-Improve-access-check-on-images.patch
Patch34: 0034-Fixes-bug-834633-Auto-assigning-floating-IPs.patch
Patch35: 0035-fixes-bug-883233.patch
- Patch36: 0036-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
- Patch37: 0037-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
- Patch38: 0038-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
- Patch39: 0039-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
- Patch40: 0040-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
- Patch41: 0041-Sanitize-EC2-manifests-and-image-tarballs.patch
-
- # These are fedora specific
- Patch100: openstack-nova-nonet.patch
- Patch101: openstack-nova-newdeps.patch
-
- # These are additional patches for upstream but not maintained at the above repo
- Patch200: 0001-Bug-898257-abstract-out-disk-image-access-methods.patch
- Patch201: 0002-Bug-898257-support-handling-images-with-libguestfs.patch
+ Patch36: 0036-Fix-deletion-of-instances-without-fixed-ips.patch
+ Patch37: 0037-Fix-file-injection-for-OSAPI-rebuilds.-Fixes-881649.patch
+ Patch38: 0038-Add-.gitreview-config-file-for-gerrit.patch
+ Patch39: 0039-Adding-bulk-create-fixed-ips.-The-true-issue-here.patch
+ Patch40: 0040-Retry-failed-SQL-connections-LP-876663.patch
+ Patch41: 0041-Updated-NoAuth-to-account-for-requests-ending-in.patch
+ Patch42: 0042-Make-sure-networks-returned-from-get_instance_nw_inf.patch
+ Patch43: 0043-Bug-884527-ajax_console_proxy_port-needs-to-be-an-in.patch
+ Patch44: 0044-Fix-lp-861160-newly-created-network-has-no-uuid.patch
+ Patch45: 0045-Fix-KeyError-when-passed-unknown-format-of-time.patch
+ Patch46: 0046-Add-local-storage-of-context-for-logging.patch
+ Patch47: 0047-Bug-884863-nova-logs-everything-to-syslog-twice.patch
+ Patch48: 0048-Bug-884534-nova-ajax-console-proxy-crashes-on-shutdo.patch
+ Patch49: 0049-exception.KeypairNotFound-usage-correction.patch
+ Patch50: 0050-fix-bug-816630.patch
+ Patch51: 0051-Log-the-exception-when-we-get-one.patch
+ Patch52: 0052-Change-floating-snat-to-float-snat.patch
+ Patch53: 0053-Fix-for-launchpad-bug-882568.patch
+ Patch54: 0054-Undefine-libvirt-saved-instances.patch
+ Patch55: 0055-Log-original-dropped-exception-when-a-new-exception-.patch
+ Patch56: 0056-Fix-exception-reraising-in-volume-manager.patch
+ Patch57: 0057-Make-run-instances-respect-availability-zone.patch
+ Patch58: 0058-Makes-rpc_allocate_fixed_ip-return-properly.patch
+ Patch59: 0059-Update-exception.wrap_exception-so-that-all-exceptio.patch
+ Patch60: 0060-Move-failed-instances-to-error-state.patch
+ Patch61: 0061-Fixes-LP878319.patch
+ Patch62: 0062-Fixes-bug-871877.patch
+ Patch63: 0063-nova-manage-exit-with-status-1-if-an-image-registrat.patch
+ Patch64: 0064-Fix-a-notification-bug-when-creating-instances.patch
+ Patch65: 0065-fix-rebuild-sha1-not-string-error.patch
+ Patch66: 0066-Verify-security-group-parameters.patch
+ Patch67: 0067-Bug-886353-Faults-raised-by-OpenStack-API-Resource-h.patch
+ Patch68: 0068-Makes-sure-gateways-forward-properly.patch
+ Patch69: 0069-Fix-a-minor-memory-leak.patch
+ Patch70: 0070-Fixes-bug-886263.patch
+ Patch71: 0071-Fix-for-bug-894431.patch
+ Patch72: 0072-Bug-897091-nova-actions-fails-with-HTTP-400-TypeErro.patch
+ Patch73: 0073-removed-logic-of-throwing-exception-if-no-floating-i.patch
+ Patch74: 0074-Fix-RPC-responses-to-allow-None-response-correctly.patch
+ Patch75: 0075-Sanitize-EC2-manifests-and-image-tarballs.patch
+ Patch76: 0076-Rename-.nova-venv-to-.venv.patch
+ Patch77: 0077-Fix-issue-in-test_s3_malicious_tarballs.patch
+ Patch78: 0078-Fixes-bug-888649.patch
+ Patch79: 0079-Fixes-bug-767947.patch
+ Patch80: 0080-Add-Support-to-delete-VMs-in-error-state.patch
+ Patch81: 0081-Fix-to-correctly-report-memory-on-Linux-3.X.patch
+ Patch82: 0082-avoid-error-and-trace-on-dom.vcpus-in-lxc.patch
+ Patch83: 0083-Bug-751229-Floating-address-range-fixed.patch
+ Patch84: 0084-Bug-820059-bin-nova-manage.py-VpnCommands.spawn-call.patch
+ Patch85: 0085-Pass-r-option-to-collie-cluster-status.patch
+ Patch86: 0086-Fixing-snapshot-failure-task_state.patch
+
+ # These are Fedora specific backports from master
+ Patch87: 0087-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
+ Patch88: 0088-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
+ Patch89: 0089-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
+ Patch90: 0090-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
+ Patch91: 0091-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
+ Patch92: 0092-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
+ Patch93: 0093-Bug-898257-abstract-out-disk-image-access-methods.patch
+ Patch94: 0094-Bug-898257-support-handling-images-with-libguestfs.patch
+
+ # This is Fedora specific and not upstream
+ Patch95: 0095-Ensure-we-don-t-access-the-net-when-building-docs.patch
+
++# This is EPEL specific and not upstream
++Patch100: openstack-nova-newdeps.patch
+
BuildArch: noarch
BuildRequires: intltool
BuildRequires: python-setuptools
@@@ -257,15 -311,61 +313,64 @@@ This package contains documentation fil
%patch39 -p1
%patch40 -p1
%patch41 -p1
-
- # apply local patches
+ %patch42 -p1
+ %patch43 -p1
+ %patch44 -p1
+ %patch45 -p1
+ %patch46 -p1
+ %patch47 -p1
+ %patch48 -p1
+ %patch49 -p1
+ %patch50 -p1
+ %patch51 -p1
+ %patch52 -p1
+ %patch53 -p1
+ %patch54 -p1
+ %patch55 -p1
+ %patch56 -p1
+ %patch57 -p1
+ %patch58 -p1
+ %patch59 -p1
+ %patch60 -p1
+ %patch61 -p1
+ %patch62 -p1
+ %patch63 -p1
+ %patch64 -p1
+ %patch65 -p1
+ %patch66 -p1
+ %patch67 -p1
+ %patch68 -p1
+ %patch69 -p1
+ %patch70 -p1
+ %patch71 -p1
+ %patch72 -p1
+ %patch73 -p1
+ %patch74 -p1
+ %patch75 -p1
+ %patch76 -p1
+ %patch77 -p1
+ %patch78 -p1
+ %patch79 -p1
+ %patch80 -p1
+ %patch81 -p1
+ %patch82 -p1
+ %patch83 -p1
+ %patch84 -p1
+ %patch85 -p1
+ %patch86 -p1
+ %patch87 -p1
+ %patch88 -p1
+ %patch89 -p1
+ %patch90 -p1
+ %patch91 -p1
+ %patch92 -p1
+ %patch93 -p1
+ %patch94 -p1
+ %patch95 -p1
+
++# Apply EPEL patch
+%patch100 -p1
- %patch101 -p1
-
- # apply misc patches
- %patch200 -p1
- %patch201 -p1
+
find . \( -name .gitignore -o -name .placeholder \) -delete
find nova -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
More information about the scm-commits
mailing list