[python-heatclient/el6-grizzly: 2/2] Merge branch 'master' into el6-grizzly

[Jakub Ruzicka]

commit 95156ba2c8672ad4f0ba8f8557be356213bbcd06
Merge: 6bf5a3f 0c1794e
Author: Jakub Ruzicka <jruzicka at redhat.com>
Date:   Thu Jul 18 17:45:10 2013 +0200

    Merge branch 'master' into el6-grizzly
    
    Conflicts:
    	python-heatclient.spec

 .gitignore             |    1 +
 python-heatclient.spec |   23 +++++++++++++++++------
 sources                |    2 +-
 3 files changed, 19 insertions(+), 7 deletions(-)
---
diff --cc python-heatclient.spec
index cfb4d77,f93d4a5..77e2a60
--- a/python-heatclient.spec
+++ b/python-heatclient.spec
@@@ -67,8 -71,12 +71,15 @@@ rm -fr html/.doctrees html/.buildinf
  %doc html
  
  %changelog
+ * Wed Jul 17 2013 Jakub Ruzicka <jruzicka at redhat.com> 0.2.3-1
+ - Updated to upstream version 0.2.3.
+ - Add new dependency: PyYAML.
+ - Add new build requires: python-d2to1 and python-pbr.
+ - Remove requirements.txt file.
+ - Generate versioninfo file.
+ 
 +* Thu Mar 28 2013 Jeff Peeler <jpeeler at redhat.com> 0.2.1-2
 +- changed buildrequires for python-sphinx to python-sphinx10
 +
  * Mon Mar 11 2013 Steven Dake <sdake at redhat.com> 0.2.1-1
  - copied from python-novaclient spec file and tailored to suit