[vdsm: 15/16] fix merge

[Peter Robinson]

commit 6784451b69302a5c919d7fc80bff04407ad0ea77
Merge: 61671d5 53d7f88
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Oct 20 16:02:55 2012 +0100

    fix merge

 .gitignore                                         |    9 +-
 ...til.yumFind-rename-and-simplify-semantics.patch |   70 +++++++
 0002-drop-deployUtil.yumSearch.patch               |   63 ++++++
 ....yumSearchVersion-compare-versions-sanely.patch |   95 +++++++++
 ...over-delete-candidates-networks-only-once.patch |   77 +++++++
 ...nslation-in-setupNetworks-is-not-relevant.patch |   33 +++
 0006-Minor-optimization-for-delNetwork.patch       |   97 +++++++++
 ...-ignore-bridgeless-networks-in-ifaceUsers.patch |   38 ++++
 0008-Minor-optimization-for-addNetwork.patch       |   65 ++++++
 0009-Use-already-known-iface-in-addNetwork.patch   |   37 ++++
 ...se-proper-MTU-on-bonding-when-add-network.patch |   39 ++++
 0011-Add-bridge-on-top-of-VLAN-if-exists.patch     |   50 +++++
 ...dd-netConfigDirty-bit-to-getVdsCaps-repor.patch |   30 +++
 0013-remove-flag-skipLibvirt.patch                 |  132 ++++++++++++
 ...llow-to-change-bond-without-network-attac.patch |  140 +++++++++++++
 ...llow-to-change-network-according-the-diff.patch |   47 +++++
 ...llow-to-remove-bond-and-attach-network-to.patch |   49 +++++
 ...BZ-826873-Allow-to-create-bond-without-ne.patch |   31 +++
 0018-BZ-832577-node-can-t-be-approved.patch        |   38 ++++
 ...298-fix-typo-in-keyword-argument-exc_info.patch |   57 +++++
 ...loyUtil-use-os.uname-instead-of-bin-uname.patch |   63 ++++++
 ...-slightly-saner-kernel-version-comparison.patch |  125 ++++++++++++
 ...llow-to-create-a-network-on-top-of-existi.patch |   39 ++++
 ...llow-to-create-VLANed-network-on-top-of-e.patch |   77 +++++++
 ...-Avoid-bond-breaking-after-network-detach.patch |   72 +++++++
 ...-bond-properly-if-connectivity-check-fail.patch |   70 +++++++
 ...-having-etc-ovirt-node-means-it-is-a-node.patch |   38 ++++
 ...t-version-to-fix-readonly-lease-unsupport.patch |   32 +++
 ...-BZ-832199-move-selinux-from-init-to-spec.patch |   89 ++++++++
 ...addNetworkValidation-do-not-explode-if-ST.patch |   34 +++
 0030-ovirt_functions-fix-elif-statement.patch      |   39 ++++
 ...837443-removeBridge-drop-remove-interface.patch |   44 ++++
 0032-BZ-837443-replace-the-netinfo-import.patch    |  199 ++++++++++++++++++
 0033-configNetwork-fix-NetInfo-call.patch          |   32 +++
 ...Z-837443-removeVlan-drop-remove-interface.patch |   55 +++++
 ...7443-remove-bridge-before-add-VDSM-bridge.patch |   64 ++++++
 ...llow-to-break-bond-and-create-a-new-netwo.patch |   47 +++++
 ...o-not-detach-network-from-the-bond-during.patch |   47 +++++
 ...ndant-explicitBonding-parameter-from-setu.patch |  115 +++++++++++
 0039-configNet-clear-up-atomicBackup-arg.patch     |   41 ++++
 ...tomicBackup-remove-new-files-upon-restore.patch |   51 +++++
 ...BZ-842948-deployUtil-safely-remove-bridge.patch |   33 +++
 0042-Ship-the-version-file-with-the-tarballs.patch |  147 +++++++++++++
 ...ommended-alignment-instead-of-using-pages.patch |   59 ++++++
 ...size-in-multiplies-of-the-recommended-tra.patch |   50 +++++
 vdsm.spec                                          |  215 +++++++++++++++++++-
 46 files changed, 3058 insertions(+), 16 deletions(-)
---
diff --cc .gitignore
index d483057,2ea9961..8219ac9
--- a/.gitignore
+++ b/.gitignore
@@@ -1,8 -1,10 +1,1 @@@
--/vdsm-4.9.1-931a43e.tar.gz
--/vdsm-4.9.2-951b41d.tar.gz
--/vdsm-4.9.2-1d7b929.tar.gz
--/vdsm-4.9.3.1.tar.gz
--/vdsm-4.9.3.2.tar.gz
- /vdsm-4.9.6-1b07249.tar.gz
- /vdsm-4.9.6-e952471.tar.gz
- /vdsm-4.10.0.tar.gz
 -/vdsm-4.9.3.3.tar.gz
 -/vdsm-4.9.4.tar.gz
 -/vdsm-4.9.6-1b07249.tar.gz
 -/vdsm-4.9.6-e952471.tar.gz
 -/vdsm-4.10.0.tar.gz
++/vdsm-*.tar.gz
diff --cc vdsm.spec
index 2bb23fc,53d5aef..33aa641
--- a/vdsm.spec
+++ b/vdsm.spec
@@@ -879,6 -1072,9 +1072,12 @@@ exit 
  * Mon May 28 2012 Federico Simoncelli <fsimonce at redhat.com> 4.9.6-0.git1b07249.fc16
  - vdsm-4.9.6-g1b07249
  
++<<<<<<< HEAD
++=======
+ * Tue Feb 28 2012 Dan Kenigsberg <danken at redhat.com> - 4.9.4-0.gb3642e5.fc17
+ - vdsm-4.9.4-0.gb3642e5
+ 
++>>>>>>> f17
  * Wed Jan 25 2012 Dan Kenigsberg <danken at redhat.com> - 4.9.3.2-0.fc16
  - vdsm-4.9.3.2
  - Reverts "BZ#773666 - Fix HSM flows should not change rw permissions."