[openstack-sahara/f21] Update to upstream 2014.1.3

[Ethan Gafford]

commit 7142acd6d5e16fddd7fe6701f42f46cf0c9f9c4c
Author: Ethan Gafford <egafford at redhat.com>
Date:   Fri Mar 20 14:48:35 2015 -0400

    Update to upstream 2014.1.3

 .gitignore                                         |  1 +
 0001-remove-runtime-dep-on-python-pbr.patch        |  2 +-
 ...ference-actual-plugins-shipped-in-tarball.patch |  2 +-
 openstack-sahara.spec                              | 39 ++++++++++++----------
 sources                                            |  2 +-
 5 files changed, 26 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1595fb9..cad2e8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /sahara-2014.1.tar.gz
 /sahara-2014.1.1.tar.gz
+/sahara-2014.1.3.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 86f753d..0776034 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From fbb8f214b2b25372a8f3116815549a9c384cae8e Mon Sep 17 00:00:00 2001
+From b7d332d809dad153d82d483e34ef97bd0912bd9b 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 d338af5..9d71667 100644
--- a/0002-reference-actual-plugins-shipped-in-tarball.patch
+++ b/0002-reference-actual-plugins-shipped-in-tarball.patch
@@ -1,4 +1,4 @@
-From 709e4b607104610c2d4dba91892024c716cd038b Mon Sep 17 00:00:00 2001
+From a4f272ff5fa3eae7f0bf44def00aa37c99b60f3e 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
diff --git a/openstack-sahara.spec b/openstack-sahara.spec
index 38d8dfb..10cf578 100644
--- a/openstack-sahara.spec
+++ b/openstack-sahara.spec
@@ -20,8 +20,8 @@
 %endif
 
 Name:          openstack-sahara
-Version:       2014.1.1
-Release:       2%{?dist}
+Version:       2014.1.3
+Release:       1%{?dist}
 Provides:      openstack-savanna = %{version}-%{release}
 Summary:       Apache Hadoop cluster management on OpenStack
 License:       ASL 2.0
@@ -32,7 +32,7 @@ Source2:       openstack-sahara-api.init
 BuildArch:     noarch
 
 #
-# patches_base=2014.1.1
+# patches_base=2014.1.3
 #
 Patch0001: 0001-remove-runtime-dep-on-python-pbr.patch
 Patch0002: 0002-reference-actual-plugins-shipped-in-tarball.patch
@@ -42,31 +42,33 @@ BuildRequires: python-setuptools
 BuildRequires: python-sphinx >= 1.1.2
 BuildRequires: python-oslo-sphinx
 BuildRequires: python-sphinxcontrib-httpdomain
-BuildRequires: python-pbr >= 0.5.19
+BuildRequires: python-pbr >= 0.6
 
 %if %{want_systemd}
 # Need systemd-units for _unitdir macro
 BuildRequires: systemd-units
 %endif
 
-Requires: python-alembic
+Requires: python-alembic >= 0.4.1
 #?Babel>=1.3?
-Requires: python-eventlet
-Requires: python-flask
-Requires: python-iso8601
-Requires: python-jsonschema >= 1.3.0
+Requires: python-eventlet >= 0.13.0
+Requires: python-flask >= 0.10
+Requires: python-iso8601 >= 0.1.9
+Requires: python-jsonschema >= 2.0.0
 Requires: python-oslo-config >= 1.2.0
 Requires: python-oslo-messaging
 Requires: python-paramiko >= 1.9.0
-Requires: python-cinderclient >= 1.0.5
-Requires: python-keystoneclient >= 0.6.0
-Requires: python-novaclient >= 2.15.0
-Requires: python-swiftclient
-Requires: python-neutronclient
-Requires: python-six >= 1.4.1
+Requires: python-requests >= 1.1
+Requires: python-cinderclient >= 1.0.6
+Requires: python-heatclient >= 0.2.3
+Requires: python-keystoneclient >= 0.7.0
+Requires: python-novaclient >= 2.17.0
+Requires: python-swiftclient >= 1.6
+Requires: python-neutronclient >= 2.3.4
+Requires: python-six >= 1.6.0
 Requires: python-stevedore >= 0.14
-Requires: python-webob
-Requires: python-sqlalchemy
+Requires: python-webob >= 1.2.3
+Requires: python-sqlalchemy >= 0.7.8
 
 %if %{want_systemd}
 Requires(post):   systemd
@@ -241,6 +243,9 @@ fi
 
 
 %changelog
+* Fri Mar 20 2015 Ethan Gafford <egafford at redhat.com> 2014.1.3-1
+- Update to upstream 2014.1.3
+
 * Thu Mar 19 2015 Ethan Gafford <egafford at redhat.com> 2014.1.1-2
 - Updated with patches from RDO patches branch (no-op change)
 
diff --git a/sources b/sources
index 6e57a49..797a984 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e52bfe6d01bc6639e44d32c5198d1ad7  sahara-2014.1.1.tar.gz
+91fa137295980a3fecdeeb2f5c2211ee  sahara-2014.1.3.tar.gz