[openstack-nova] resync patches from master-patches without git version
Pádraig Brady
pbrady at fedoraproject.org
Thu Jan 26 12:48:00 UTC 2012
commit b8158c6983488d03741edac308ca4bdb626ad79e
Author: Pádraig Brady <P at draigBrady.com>
Date: Thu Jan 26 12:34:20 2012 +0000
resync patches from master-patches without git version
...fix-X-Server-Management-Url-for-v1.0-noau.patch | 3 ---
...hain-rule-for-EC2-metadata-requests-lp-85.patch | 3 ---
...pi-add-the-INPUT-rule-for-EC2-metadata-lp.patch | 3 ---
...ser-to-choose-either-ietadm-or-tgtadm-lp-.patch | 3 ---
...e-VolumeDriver.sync_exec-method-lp-819997.patch | 3 ---
...tadm-tgtadm-calls-out-into-helper-classes.patch | 3 ---
...tgtadm-off-by-one-error.-Fixes-bug-871278.patch | 3 ---
...57-abstract-out-disk-image-access-methods.patch | 3 ---
...7-support-handling-images-with-libguestfs.patch | 3 ---
...estfs-operation-with-specified-partitions.patch | 3 ---
...e-don-t-access-the-net-when-building-docs.patch | 3 ---
11 files changed, 0 insertions(+), 33 deletions(-)
---
diff --git a/0001-Bug-920497-fix-X-Server-Management-Url-for-v1.0-noau.patch b/0001-Bug-920497-fix-X-Server-Management-Url-for-v1.0-noau.patch
index 40d2759..73287cd 100644
--- a/0001-Bug-920497-fix-X-Server-Management-Url-for-v1.0-noau.patch
+++ b/0001-Bug-920497-fix-X-Server-Management-Url-for-v1.0-noau.patch
@@ -42,6 +42,3 @@ index d435f83..d8dbb68 100644
res = webob.Response()
# NOTE(vish): This is expecting and returning Auth(1.1), whereas
# keystone uses 2.0 auth. We should probably allow
---
-1.7.6.5
-
diff --git a/0002-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch b/0002-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
index f17e08c..91dcf73 100644
--- a/0002-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
+++ b/0002-Add-INPUT-chain-rule-for-EC2-metadata-requests-lp-85.patch
@@ -35,6 +35,3 @@ index a6aea8a..df43f54 100755
iptables_manager.apply()
---
-1.7.6.5
-
diff --git a/0003-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch b/0003-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
index 830aeeb..4b8493d 100644
--- a/0003-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
+++ b/0003-Have-nova-api-add-the-INPUT-rule-for-EC2-metadata-lp.patch
@@ -183,6 +183,3 @@ index 247eb4f..b9ad579 100644
self.server.start()
self.port = self.server.port
---
-1.7.6.5
-
diff --git a/0004-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch b/0004-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
index bbad1a4..ddde94e 100644
--- a/0004-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
+++ b/0004-Allow-the-user-to-choose-either-ietadm-or-tgtadm-lp-.patch
@@ -231,6 +231,3 @@ index bb56956..781b1f2 100644
except exception.ProcessExecutionError, e:
# Instances remount read-only in this case.
# /etc/init.d/iscsitarget restart and rebooting nova-volume
---
-1.7.6.5
-
diff --git a/0005-Remove-VolumeDriver.sync_exec-method-lp-819997.patch b/0005-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
index ac4e93d..927819d 100644
--- a/0005-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
+++ b/0005-Remove-VolumeDriver.sync_exec-method-lp-819997.patch
@@ -231,6 +231,3 @@ index 781b1f2..67ea423 100644
except exception.ProcessExecutionError:
LOG.debug(_("Failed to retrieve QoS info"))
return {}
---
-1.7.6.5
-
diff --git a/0006-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch b/0006-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
index f09ee71..76af87a 100644
--- a/0006-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
+++ b/0006-Refactor-ietadm-tgtadm-calls-out-into-helper-classes.patch
@@ -556,6 +556,3 @@ index 0000000..d50dd5f
+ return TgtAdm()
+ else:
+ return IetAdm()
---
-1.7.6.5
-
diff --git a/0007-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch b/0007-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
index 3df75b0..42bc4e2 100644
--- a/0007-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
+++ b/0007-Fix-tgtadm-off-by-one-error.-Fixes-bug-871278.patch
@@ -33,6 +33,3 @@ index 82f0106..7069626 100644
# The /dev/disk/by-path/... node is not always present immediately
# TODO(justinsb): This retry-with-delay is a pattern, move to utils?
---
-1.7.6.5
-
diff --git a/0008-Bug-898257-abstract-out-disk-image-access-methods.patch b/0008-Bug-898257-abstract-out-disk-image-access-methods.patch
index a737297..e85ff6d 100644
--- a/0008-Bug-898257-abstract-out-disk-image-access-methods.patch
+++ b/0008-Bug-898257-abstract-out-disk-image-access-methods.patch
@@ -1078,6 +1078,3 @@ index 55cb31d..9abd330 100644
if FLAGS.libvirt_type == 'uml':
utils.execute('chown', 'root', basepath('disk'), run_as_root=True)
---
-1.7.6.5
-
diff --git a/0009-Bug-898257-support-handling-images-with-libguestfs.patch b/0009-Bug-898257-support-handling-images-with-libguestfs.patch
index 2865b46..8cfd19b 100644
--- a/0009-Bug-898257-support-handling-images-with-libguestfs.patch
+++ b/0009-Bug-898257-support-handling-images-with-libguestfs.patch
@@ -153,6 +153,3 @@ index 0000000..6323dc8
+ # but ordinary users do
+ utils.execute('fusermount', '-u', self.mount_dir, run_as_root=True)
+ self.mounted = False
---
-1.7.6.5
-
diff --git a/0010-Fix-libguestfs-operation-with-specified-partitions.patch b/0010-Fix-libguestfs-operation-with-specified-partitions.patch
index 6515680..75e6f21 100644
--- a/0010-Fix-libguestfs-operation-with-specified-partitions.patch
+++ b/0010-Fix-libguestfs-operation-with-specified-partitions.patch
@@ -38,6 +38,3 @@ index 6323dc8..20e3eda 100644
else:
# We don't resort to -i for this case yet,
# as some older versions of libguestfs
---
-1.7.6.5
-
diff --git a/0011-Ensure-we-don-t-access-the-net-when-building-docs.patch b/0011-Ensure-we-don-t-access-the-net-when-building-docs.patch
index 48318af..7a175b1 100644
--- a/0011-Ensure-we-don-t-access-the-net-when-building-docs.patch
+++ b/0011-Ensure-we-don-t-access-the-net-when-building-docs.patch
@@ -23,6 +23,3 @@ index 996dfb0..f62ebf8 100644
# autodoc generation is a bit aggressive and a nuisance when doing heavy text edit cycles.
# execute "export SPHINX_DEBUG=1" in your terminal to disable
---
-1.7.6.5
-
More information about the scm-commits
mailing list