Merge branch 'master' into f17

Conflicts: .gitignore
2012-09-06 17:45:58 -05:00 · 2012-09-06 17:45:58 -05:00 · 8aacfde58b
commit 8aacfde58b
parent f04571f109 75bb1b190a
3 changed files with 6 additions and 6 deletions
--- a/.gitignore
+++ b/.gitignore
@ -5,8 +5,5 @@
 /pcs-0.9.3.linux-x86_64.tar.gz
 /pcs-0.9.3.1.linux-x86_64.tar.gz
 /pcs-0.9.3.1.tar.gz
-<<<<<<< HEAD
-/pcs-0.9.4.tar.gz
-=======
 /pcs-0.9.12.tar.gz
->>>>>>> origin/master
+/pcs-0.9.19.tar.gz
--- a/pcs.spec
+++ b/pcs.spec
@ -1,5 +1,5 @@
 Name: pcs		
-Version: 0.9.12
+Version: 0.9.19
 Release: 1%{?dist}
 License: GPLv2
 URL: http://github.com/feist/pcs
@ -38,6 +38,9 @@ chmod 755 $RPM_BUILD_ROOT/%{python_sitelib}/pcs/pcs.py
 %doc COPYING README

 %changelog
+* Thu Sep 06 2012 Chris Feist <cfeist@redhat.cmo> - 0.9.19-1
+- Resync to latest version of pcs
+
 * Tue Aug 07 2012 Chris Feist <cfeist@redhat.com> - 0.9.12-1
 - Resync to latest version of pcs

--- a/2
+++ b/2
@ -1 +1 @@
-1c1b11b7835cdcda340eecbcc7a6fc3a  pcs-0.9.12.tar.gz
+d99c3c24839422be7f9c9bfc2d27a4b8  pcs-0.9.19.tar.gz