[vdsm/f19: 6/6] Merge branch 'master' into f19
Federico Simoncelli
fsimonce at fedoraproject.org
Tue Aug 13 15:29:17 UTC 2013
commit 942a0d7138c7c3f8907ea2beabb13ff107a524fd
Merge: 30595c2 63105a2
Author: Federico Simoncelli <fsimonce at redhat.com>
Date: Tue Aug 13 17:26:06 2013 +0200
Merge branch 'master' into f19
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
Conflicts:
vdsm.spec
0001-mom-Require-latest-mom.patch | 36 +
0001-schema-Fix-schema-for-VM.updateDevice.patch | 65 --
...ed-as-conflicting-service-in-the-init-fil.patch | 35 +
...hema-Missing-comment-for-new-VmDeviceType.patch | 36 -
...ort-CPU-thread-info-in-getVdsCapabilities.patch | 53 --
...ook-sriov-on-el6-should-not-require-non-e.patch | 40 +
...or-migrations-that-involve-devices-with-n.patch | 49 ++
0004-caps.py-osversion-validate-OVIRT.patch | 35 -
...-libvirtd-didn-t-work-over-allinone-setup.patch | 37 -
...-retrieve-alias-for-Balloon-and-Console-d.patch | 88 ++
0006-Integrate-Smartcard-support.patch | 421 ----------
...gression-introduced-by-refactoring-libvir.patch | 76 ++
...ites-its-version-number-in-VDSM-generated.patch | 53 ++
...m.spec-python-ordereddict-only-for-rhel-7.patch | 42 -
...quires-version-of-selinux-policy-targeted.patch | 41 +
...on-t-require-python-ordereddict-on-fedora.patch | 42 -
...vdsm.spec-BuildRequires-python-pthreading.patch | 31 -
...reg-fix-ovirt_node-without-default-bridge.patch | 47 ++
...or-both-py-and-pyc-file-to-start-super-vd.patch | 54 --
...e-script-now-checks-that-the-DHCP-respons.patch | 46 +
...network-is-now-kept-in-main-routing-table.patch | 324 ++++++++
0011-adding-getHardwareInfo-API-to-vdsm.patch | 334 --------
0012-Explicitly-shutdown-m2crypto-socket.patch | 55 --
...-dhcp-source-routing-if-the-removal-reaso.patch | 38 +
...ge-use-successor-volume-size-when-merging.patch | 47 ++
...re-policycoreutils-and-skip-sebool-errors.patch | 59 --
...es-selinux-policy-to-avoid-selinux-failur.patch | 42 -
...md.service-require-either-ntpd-or-chronyd.patch | 36 -
...idn-t-check-local-variable-before-reading.patch | 44 -
0017-udev-Race-fix-load-and-trigger-dev-rule.patch | 115 ---
..._id-command-path-to-be-configured-at-runt.patch | 171 ----
...orce-upgrade-to-v2-before-upgrading-to-v3.patch | 91 --
0020-misc-rename-safelease-to-clusterlock.patch | 866 --------------------
...ct-the-cluster-lock-using-makeClusterLock.patch | 151 ----
...lock-add-the-local-locking-implementation.patch | 225 -----
...ch-MetaDataKeyNotFoundError-when-preparin.patch | 38 -
0024-vdsm.spec-Require-openssl.patch | 31 -
0025-Fedora-18-require-a-newer-udev.patch | 36 -
0026-fix-sloppy-backport-of-safelease-rename.patch | 40 -
...g-the-use-of-zombie-reaper-from-supervdsm.patch | 52 --
...llow-delete-update-of-devices-with-no-ifc.patch | 63 --
...licycoreutils-2.1.13-55-to-avoid-another-.patch | 41 -
...to-connect-to-supervdsm-more-than-3-time-.patch | 50 --
0031-packaging-add-load_needed_modules.py.in.patch | 81 --
...e_bond_dev-reopen-bonding_masters-per-bon.patch | 38 -
...er-Handling-Attribute-error-in-Python-2.6.patch | 91 --
0034-bootstrap-remove-glusterfs-packages.patch | 52 --
...-gluster-set-glusterfs-dependency-version.patch | 33 -
...te-the-template-when-zeroing-a-dependant-.patch | 65 --
0037-vdsm.spec-fence-agents-all.patch | 59 --
0038-fix-storage.fuser.patch | 85 --
...up-libvirt-version-to-fix-network-linking.patch | 36 -
0040-vdsm.spec.in-with_gluster.patch | 80 --
0041-Don-t-user-sudo-in-fuser.patch | 94 ---
...svdsm-fix-fuser-import-in-supervdsmServer.patch | 31 -
...sm-configuration-when-removing-vdsm-servi.patch | 62 --
...ating-supervdsm-log-to-supervdsm.log-file.patch | 144 ----
0045-vdsm.spec-Adding-with_systemd-macro.patch | 124 ---
0046-spec-use-the-fedora-systemd-macros.patch | 140 ----
...-enable-gluster-upstream-and-on-fedora-19.patch | 64 --
....am-ignore-false-positive-pyflakes-lvm.py.patch | 38 -
0049-Deactivate-libvirtVM.Drives.patch | 79 --
0050-vdsm-fix-Vm-cleanup-routine.patch | 106 ---
0051-Support-teardownVolumePath-None.patch | 45 -
0052-vdsm.spec-update-python-pthreading.patch | 56 --
...-service-make-iscsid-a-systemd-dependency.patch | 47 --
sources | 2 +-
vdsm.spec | 430 +++++++----
68 files changed, 1209 insertions(+), 5149 deletions(-)
---
diff --cc vdsm.spec
index 0acce9f,366613b..746849c
--- a/vdsm.spec
+++ b/vdsm.spec
@@@ -60,63 -61,21 +61,20 @@@ Url: http://www.ovirt.org/wi
# make VERSION={version}-{vdsm_release} dist
Source0: %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
- # ovirt-3.2 patches
- Patch0: 0001-schema-Fix-schema-for-VM.updateDevice.patch
- Patch1: 0002-schema-Missing-comment-for-new-VmDeviceType.patch
- Patch2: 0003-api-Report-CPU-thread-info-in-getVdsCapabilities.patch
- Patch3: 0004-caps.py-osversion-validate-OVIRT.patch
- Patch4: 0005-restarting-libvirtd-didn-t-work-over-allinone-setup.patch
- Patch5: 0006-Integrate-Smartcard-support.patch
- Patch6: 0007-vdsm.spec-python-ordereddict-only-for-rhel-7.patch
- Patch7: 0008-vdsm.spec-Don-t-require-python-ordereddict-on-fedora.patch
- Patch8: 0009-vdsm.spec-BuildRequires-python-pthreading.patch
- Patch9: 0010-Searching-for-both-py-and-pyc-file-to-start-super-vd.patch
- Patch10: 0011-adding-getHardwareInfo-API-to-vdsm.patch
- Patch11: 0012-Explicitly-shutdown-m2crypto-socket.patch
- Patch12: 0013-spec-require-policycoreutils-and-skip-sebool-errors.patch
- Patch13: 0014-spec-requires-selinux-policy-to-avoid-selinux-failur.patch
- Patch14: 0015-vdsmd.service-require-either-ntpd-or-chronyd.patch
- Patch15: 0016-isRunning-didn-t-check-local-variable-before-reading.patch
- Patch16: 0017-udev-Race-fix-load-and-trigger-dev-rule.patch
- Patch17: 0018-Change-scsi_id-command-path-to-be-configured-at-runt.patch
- Patch18: 0019-upgrade-force-upgrade-to-v2-before-upgrading-to-v3.patch
- Patch19: 0020-misc-rename-safelease-to-clusterlock.patch
- Patch20: 0021-domain-select-the-cluster-lock-using-makeClusterLock.patch
- Patch21: 0022-clusterlock-add-the-local-locking-implementation.patch
- Patch22: 0023-upgrade-catch-MetaDataKeyNotFoundError-when-preparin.patch
- Patch23: 0024-vdsm.spec-Require-openssl.patch
- Patch24: 0025-Fedora-18-require-a-newer-udev.patch
- Patch25: 0026-fix-sloppy-backport-of-safelease-rename.patch
- Patch26: 0027-removing-the-use-of-zombie-reaper-from-supervdsm.patch
- Patch27: 0028-configNet-allow-delete-update-of-devices-with-no-ifc.patch
- Patch28: 0029-Requires-policycoreutils-2.1.13-55-to-avoid-another-.patch
- Patch29: 0030-After-fail-to-connect-to-supervdsm-more-than-3-time-.patch
- # This patch is not present in the upstream ovirt-3.2 branch and it was added to
- # add a missing file in the base vdsm tar.gz
- Patch30: 0031-packaging-add-load_needed_modules.py.in.patch
- Patch31: 0032-tool-_enable_bond_dev-reopen-bonding_masters-per-bon.patch
- Patch32: 0033-gluster-Handling-Attribute-error-in-Python-2.6.patch
- Patch33: 0034-bootstrap-remove-glusterfs-packages.patch
- Patch34: 0035-gluster-set-glusterfs-dependency-version.patch
- Patch35: 0036-Do-not-delete-the-template-when-zeroing-a-dependant-.patch
- Patch36: 0037-vdsm.spec-fence-agents-all.patch
- Patch37: 0038-fix-storage.fuser.patch
- Patch38: 0039-Bump-up-libvirt-version-to-fix-network-linking.patch
- Patch39: 0040-vdsm.spec.in-with_gluster.patch
- Patch40: 0041-Don-t-user-sudo-in-fuser.patch
- Patch41: 0042-svdsm-fix-fuser-import-in-supervdsmServer.patch
- Patch42: 0043-Removing-vdsm-configuration-when-removing-vdsm-servi.patch
- Patch43: 0044-Seperating-supervdsm-log-to-supervdsm.log-file.patch
- Patch44: 0045-vdsm.spec-Adding-with_systemd-macro.patch
- Patch45: 0046-spec-use-the-fedora-systemd-macros.patch
- Patch46: 0047-spec-enable-gluster-upstream-and-on-fedora-19.patch
- Patch47: 0048-Makefile.am-ignore-false-positive-pyflakes-lvm.py.patch
- Patch48: 0049-Deactivate-libvirtVM.Drives.patch
- Patch49: 0050-vdsm-fix-Vm-cleanup-routine.patch
- Patch50: 0051-Support-teardownVolumePath-None.patch
- Patch51: 0052-vdsm.spec-update-python-pthreading.patch
- Patch52: 0053-service-make-iscsid-a-systemd-dependency.patch
+ Patch1: 0001-mom-Require-latest-mom.patch
+ Patch2: 0002-Mark-ksmtuned-as-conflicting-service-in-the-init-fil.patch
+ Patch3: 0003-spec-vdsm-hook-sriov-on-el6-should-not-require-non-e.patch
+ Patch4: 0004-Crash-fix-for-migrations-that-involve-devices-with-n.patch
+ Patch5: 0005-vdsm-Always-retrieve-alias-for-Balloon-and-Console-d.patch
+ Patch6: 0006-vdsm-Fix-regression-introduced-by-refactoring-libvir.patch
+ Patch7: 0007-VDSM-now-writes-its-version-number-in-VDSM-generated.patch
+ Patch8: 0008-Bump-requires-version-of-selinux-policy-targeted.patch
+ Patch9: 0009-vdsm_reg-fix-ovirt_node-without-default-bridge.patch
+ Patch10: 0010-Source-Route-script-now-checks-that-the-DHCP-respons.patch
+ Patch11: 0011-Management-network-is-now-kept-in-main-routing-table.patch
+ Patch12: 0012-Only-remove-dhcp-source-routing-if-the-removal-reaso.patch
+ Patch13: 0013-image-use-successor-volume-size-when-merging.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
More information about the scm-commits
mailing list