[os-refresh-config: 3/3] Merge branch 'f20'

[slagle]

commit daf9b362584eeb347ff3a22bd0bc9ffa8e23ab47
Merge: 1107494 f5351c6
Author: James Slagle <jslagle at redhat.com>
Date:   Thu Sep 11 11:24:33 2014 -0400

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

 os-refresh-config.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc os-refresh-config.spec
index 2f93ca0,e842f4c..c8f9ccd
--- a/os-refresh-config.spec
+++ b/os-refresh-config.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:		os-refresh-config
  Version:	0.1.5
--Release:	2%{?dist}
++Release:	3%{?dist}
  Summary:	Refresh system configuration
  
  License:	ASL 2.0
@@@ -35,9 -39,9 +39,12 @@@ Tool to refresh openstack config change
  %{python_sitelib}/os_refresh_config*
  
  %changelog
 -* Thu Sep 11 2014 James Slagle <jslagle at redhat.com> - 0.1.5-2
++* Thu Sep 11 2014 James Slagle <jslagle at redhat.com> - 0.1.5-3
+ - Switch to rdopkg
+ 
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.5-2
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
  * Fri May 9 2014 Ben Nemec <bnemec at redhat.com> - 0.1.5-1
  - Update to 0.1.5
  - Add dependency on new dib-utils package