[os-apply-config: 5/5] Merge branch 'f20'

[slagle]

commit 8a693a8154e212fa2ad6d379a9cd21a230e807a0
Merge: 20e3d36 4bfd49d
Author: James Slagle <jslagle at redhat.com>
Date:   Thu Sep 11 11:18:47 2014 -0400

    Merge branch 'f20'
    
    Conflicts:
    	os-apply-config.spec

 ...runtime-dependency-and-replace-with-build.patch |    5 +----
 os-apply-config.spec                               |    9 ++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --cc os-apply-config.spec
index a7cfcd6,0160ffa..7ef7257
--- a/os-apply-config.spec
+++ b/os-apply-config.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:		os-apply-config
  Version:	0.1.16
- Release:	2%{?dist}
 -Release:	1%{?dist}
++Release:	3%{?dist}
  Summary:	Configure files from cloud metadata
  
  License:	ASL 2.0
@@@ -47,9 -51,9 +51,12 @@@ sed -i s/REDHATOSAPPLYCONFIGRELEASE/%{r
  %{python_sitelib}/os_apply_config*
  
  %changelog
 -* Thu Sep 11 2014 James Slagle <jslagle at redhat.com> - 0.1.16-1
++* Thu Sep 11 2014 James Slagle <jslagle at redhat.com> - 0.1.16-3
+ - Switch to rdopkg
+ 
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.16-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
  * Fri May 9 2014 Ben Nemec <bnemec at redhat.com> - 0.1.16-1
  - Update to version 0.1.16