[openstack-sahara] rebase to stable icehouse 2014.1.1

[Pádraig Brady]

commit 8e88e745b9afbe82bcc173960c7486f27ec09e11
Author: Pádraig Brady <P at draigBrady.com>
Date:   Thu Jul 17 12:48:13 2014 +0100

    rebase to stable icehouse 2014.1.1

 .gitignore                                         |    1 +
 0001-remove-runtime-dep-on-python-pbr.patch        |    2 +-
 ...ference-actual-plugins-shipped-in-tarball.patch |   25 +++----------------
 openstack-sahara.spec                              |   10 ++++---
 sources                                            |    2 +-
 5 files changed, 13 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 641033f..1595fb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sahara-2014.1.tar.gz
+/sahara-2014.1.1.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 255a498..b41de8f 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 55b3ea98f8886d8c2123d0dfacb0d6eaa5c98b81 Mon Sep 17 00:00:00 2001
+From c7ca46c334d070078111e36b7962ec67585cbc66 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Thu, 17 Jul 2014 11:59:16 +0100
 Subject: [PATCH] remove runtime dep on python-pbr
diff --git a/0002-reference-actual-plugins-shipped-in-tarball.patch b/0002-reference-actual-plugins-shipped-in-tarball.patch
index d5e9c38..d945f66 100644
--- a/0002-reference-actual-plugins-shipped-in-tarball.patch
+++ b/0002-reference-actual-plugins-shipped-in-tarball.patch
@@ -1,15 +1,15 @@
-From 0ff3a87a05065456d589465643cb817cac4d0d83 Mon Sep 17 00:00:00 2001
+From 05df127529293acd75cc73373625fff6cfb5a231 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P at draigBrady.com>
 Date: Thu, 17 Jul 2014 12:01:00 +0100
 Subject: [PATCH] reference actual plugins shipped in tarball
 
 Report and analysis from Dalmais Maxence <maxence.dalmais at worldline.com>
 ---
- MANIFEST.in |   12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
+ MANIFEST.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
 
 diff --git a/MANIFEST.in b/MANIFEST.in
-index dadbd42..6d5538b 100644
+index 20fc1c8..6d5538b 100644
 --- a/MANIFEST.in
 +++ b/MANIFEST.in
 @@ -4,8 +4,10 @@ include ChangeLog
@@ -23,20 +23,3 @@ index dadbd42..6d5538b 100644
  
  recursive-include sahara/locale *
  
-@@ -20,10 +22,12 @@ include sahara/plugins/vanilla/v2_3_0/resources/*.xml
- include sahara/plugins/vanilla/v2_3_0/resources/*.sh
- include sahara/plugins/vanilla/v2_3_0/resources/*.sql
- include sahara/plugins/vanilla/v2_3_0/resources/*.template
--include sahara/plugins/hdp/versions/1_3_2/resources/*.template
--include sahara/plugins/hdp/versions/1_3_2/resources/*.json
--include sahara/plugins/hdp/versions/2_0/resources/*.template
--include sahara/plugins/hdp/versions/2_0/resources/*.json
-+include sahara/plugins/hdp/versions/version_1_3_2/resources/*.template
-+include sahara/plugins/hdp/versions/version_1_3_2/resources/*.json
-+include sahara/plugins/hdp/versions/version_1_3_2/resources/*.sh
-+include sahara/plugins/hdp/versions/version_2_0_6/resources/*.template
-+include sahara/plugins/hdp/versions/version_2_0_6/resources/*.json
-+include sahara/plugins/hdp/versions/version_2_0_6/resources/*.sh
- include sahara/resources/*.heat
- include sahara/service/edp/resources/*.xml
- include sahara/swift/resources/*.xml
diff --git a/openstack-sahara.spec b/openstack-sahara.spec
index 8012646..03fedaa 100644
--- a/openstack-sahara.spec
+++ b/openstack-sahara.spec
@@ -20,10 +20,9 @@
 %endif
 
 Name:          openstack-sahara
-Version:       2014.1
-Release:       14%{?dist}
+Version:       2014.1.1
+Release:       1%{?dist}
 Provides:      openstack-savanna = %{version}-%{release}
-Obsoletes:     openstack-savanna <= 2014.1.b3-3
 Summary:       Apache Hadoop cluster management on OpenStack
 License:       ASL 2.0
 URL:           https://launchpad.net/sahara
@@ -33,7 +32,7 @@ Source2:       openstack-sahara-api.init
 BuildArch:     noarch
 
 #
-# patches_base=2014.1
+# patches_base=2014.1.1
 #
 Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
 Patch0002: 0002-reference-actual-plugins-shipped-in-tarball.patch
@@ -242,6 +241,9 @@ fi
 
 
 %changelog
+* Thu Jul 17 2014 Pádraig Brady <pbrady at redhat.com> - 2014.1.1-1
+- Stable icehouse 2014.1.1 rebase
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2014.1.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 51853e7..6e57a49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ce0573dbc0760b3d00d00f14ec6e15e9  sahara-2014.1.tar.gz
+e52bfe6d01bc6639e44d32c5198d1ad7  sahara-2014.1.1.tar.gz