[cloud-init/el6: 2/2] Merge branch 'master' into el6

[Pádraig Brady]

commit 885c28753a633e6776c2a908a4d7e8dfdc311021
Merge: da2af48 7dfb056
Author: Pádraig Brady <P at draigBrady.com>
Date:   Fri Jun 29 13:25:34 2012 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	cloud-init.spec

 cloud-init-0.6.3-yum.patch |   79 ++++++++++++++++++++++++++++++++++++++++++++
 cloud-init.spec            |    7 +++-
 2 files changed, 85 insertions(+), 1 deletions(-)
---
diff --cc cloud-init.spec
index cd02de6,9a04e78..b1a2a5c
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:           cloud-init
  Version:        0.6.3
- Release:        0.6.bzr532%{?dist}
 -Release:        0.3.bzr532%{?dist}
++Release:        0.7.bzr532%{?dist}
  Summary:        Cloud instance init scripts
  
  Group:          System Environment/Base
@@@ -19,10 -18,7 +19,11 @@@ Patch0:         cloud-init-0.6.3-fedora
  Patch1:         cloud-init-0.6.3-no-runparts.patch
  # https://bugs.launchpad.net/cloud-init/+bug/970071
  Patch2:         cloud-init-0.6.3-lp970071.patch
 -Patch3:         cloud-init-0.6.3-yum.patch
 +# Add sysv init scripts
 +Patch3:         cloud-init-0.6.3-sysv.patch
 +# Support subprocess on python < 2.7
 +Patch4:         cloud-init-0.6.3-subprocess-2.6.patch
++Patch5:         cloud-init-0.6.3-yum.patch
  
  BuildArch:      noarch
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@@ -57,7 -55,6 +58,8 @@@ ssh keys and to let the user run variou
  %patch1 -p0
  %patch2 -p1
  %patch3 -p1
 +%patch4 -p1
++%patch5 -p1
  
  cp -p %{SOURCE2} README.fedora
  
@@@ -134,15 -136,9 +136,18 @@@ f
  
  
  %changelog
 -* Wed Jun 27 2012 Pádraig Brady <P at draigBrady.com> - 0.6.3-0.3.bzr532
++* Wed Jun 27 2012 Pádraig Brady <P at draigBrady.com> - 0.6.3-0.7.bzr532
+ - Add support for installing yum packages
+ 
 +* Mon Jun 18 2012 Pádraig Brady <P at draigBrady.com> - 0.6.3-0.6.bzr532
 +- Further adjustments to support EPEL 6
 +
 +* Fri Jun 15 2012 Tomas Karasek <tomas.karasek at cern.ch> - 0.6.3-0.5.bzr532
 +- Fix cloud-init-cfg invocation in init script
 +
 +* Tue May 22 2012 Pádraig Brady <P at draigBrady.com> - 0.6.3-0.4.bzr532
 +- Support EPEL 6
 +
  * Sat Mar 31 2012 Andy Grimm <agrimm at gmail.com> - 0.6.3-0.2.bzr532
  - Fixed incorrect interpretation of relative path for
    AuthorizedKeysFile (BZ #735521)