[openstack-packstack/icehouse-epel7] Updated to packstack-2014.1.1dev1045.tar.gz

[Martin Mágr]

commit d02762c8c6904a8e9ccf29c653c2b470bc290d33
Author: Martin Magr <mmagr at redhat.com>
Date:   Mon Apr 7 11:48:36 2014 +0200

    Updated to packstack-2014.1.1dev1045.tar.gz
    
    Conflicts:
    	openstack-packstack.spec

 .gitignore               |    1 +
 openstack-packstack.spec |   16 +++++++++-------
 qpid-conf.patch          |   39 ---------------------------------------
 sources                  |    2 +-
 4 files changed, 11 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 826c848..c8cf727 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,4 @@
 /packstack-2014.1.1dev1025.tar.gz
 /packstack-2014.1.1dev1032.tar.gz
 /packstack-2014.1.1dev1033.tar.gz
+/packstack-2014.1.1dev1045.tar.gz
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index eef8817..984235d 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -1,12 +1,12 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
-%global git_revno 1033
+%global git_revno 1045
 
 
 # openstack-packstack ----------------------------------------------------------
 
 Name:           openstack-packstack
 Version:        2014.1.1
-Release:        0.9.dev%{git_revno}%{?dist}
+Release:        0.10.dev%{git_revno}%{?dist}
 Summary:        Openstack Install Utility
 
 Group:          Applications/System
@@ -18,8 +18,7 @@ Patch0:         el7-prescript.patch
 Patch1:         enable-epel.patch
 Patch2:         epel-releasever.patch
 Patch3:         disable-nagios.patch
-Patch4:         qpid-conf.patch
-Patch5:         el7-swift.patch
+Patch4:         el7-swift.patch
 
 BuildArch:      noarch
 
@@ -74,7 +73,6 @@ This package contains documentation files for Packstack.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 # Sanitizing a lot of the files in the puppet modules, they come from seperate upstream projects
 find packstack/puppet/modules \( -name .fixtures.yml -o -name .gemfile -o -name ".travis.yml" -o -name .rspec \) -exec rm {} +
@@ -146,12 +144,16 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 # changelog --------------------------------------------------------------------
 
 %changelog
+* Mon Apr 7 2014 Martin Mágr <mmagr at redhat.com> - 2014.1.1-0.10.dev1045
+- Updated Heat templates (rhbz#1084216)
+- Use mariadb-galera-server for server package
+- Fix QPID config path compatibility (rhbz#1070072)
+- Make RabbitMQ default AMQP provider
+
 * Wed Apr 2 2014 Martin Mágr <mmagr at redhat.com> - 2014.1.1-0.9.dev1033
 - Removed el7-horizon.patch (rhbz#1080442)
 
 * Mon Mar 31 2014 Iván Chavero <ichavero at redhat.com> - 2014.1.1-0.8.dev1033
-- Mongodb modules want bind_ip to be a list (lp#1297984)
-- Mongodb/ceilmoneter manifests cannot depend on eachother (lp#1297995)
 - Changes the mysql charset to utf8 (rhbz#1080595, rhbz#1080355)
 
 * Fri Mar 28 2014 Martin Mágr <mmagr at redhat.com> - 2014.1.1-0.7.dev1032
diff --git a/sources b/sources
index 6ee08ee..950fd14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-134f1b405b4a477870ca55c27cf06fec  packstack-2014.1.1dev1033.tar.gz
+a81f286049096eed13b65e766c1d188f  packstack-2014.1.1dev1045.tar.gz