[openstack-keystone/f21] Update to upstream 2014.1.4

[Alan Pevec]

commit 867d9a27b593ae200c64f5f80bf05393b6b0535a
Author: Alan Pevec <alan.pevec at redhat.com>
Date:   Wed Mar 18 23:41:50 2015 +0100

    Update to upstream 2014.1.4
    
    Change-Id: Ia46304cf03a3ac17171355163169e1d83f75db35

 .gitignore                                               | 1 +
 0001-remove-runtime-dep-on-python-pbr.patch              | 6 +++---
 0002-sync-parameter-values-with-keystone-dist.conf.patch | 2 +-
 0003-Refactor-service-readiness-notification.patch       | 4 ++--
 openstack-keystone.spec                                  | 5 ++++-
 sources                                                  | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6c59f46..4dd287f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /keystone-2014.1.1.tar.gz
 /keystone-2014.1.2.1.tar.gz
 /keystone-2014.1.3.tar.gz
+/keystone-2014.1.4.tar.gz
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 1915935..26815bd 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,4 +1,4 @@
-From 53b8fd5dab6020424c366bc6a3a5775a5ce32ac3 Mon Sep 17 00:00:00 2001
+From 1aa759bcc91bdfd0b41ebe31953325b8d9e3acbe Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 00:38:42 +0200
 Subject: [PATCH] remove runtime dep on python-pbr
@@ -9,7 +9,7 @@ Subject: [PATCH] remove runtime dep on python-pbr
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/bin/keystone-all b/bin/keystone-all
-index 8d7c4b3..315f3c1 100755
+index 8301eb9..7778e47 100755
 --- a/bin/keystone-all
 +++ b/bin/keystone-all
 @@ -32,7 +32,6 @@ if os.path.exists(os.path.join(possible_topdir,
@@ -28,7 +28,7 @@ index 8d7c4b3..315f3c1 100755
 +         version='REDHATKEYSTONEVERSION',
           default_config_files=config_files)
  
-     config.setup_logging()
+     monkeypatch_thread = not CONF.standard_threads
 diff --git a/keystone/cli.py b/keystone/cli.py
 index a9decbd..9411219 100644
 --- a/keystone/cli.py
diff --git a/0002-sync-parameter-values-with-keystone-dist.conf.patch b/0002-sync-parameter-values-with-keystone-dist.conf.patch
index 89f8213..9fa390f 100644
--- a/0002-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0002-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,4 +1,4 @@
-From b911fdd30f716e4462c1a349facabc93eef9b555 Mon Sep 17 00:00:00 2001
+From e378019a7795706115045e8947e5186befacdd1f Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 15:22:20 +0200
 Subject: [PATCH] sync parameter values with keystone-dist.conf
diff --git a/0003-Refactor-service-readiness-notification.patch b/0003-Refactor-service-readiness-notification.patch
index 6eeda58..85ba77e 100644
--- a/0003-Refactor-service-readiness-notification.patch
+++ b/0003-Refactor-service-readiness-notification.patch
@@ -1,4 +1,4 @@
-From e7d858a6ff239101187219228b2da560e66d8660 Mon Sep 17 00:00:00 2001
+From 31f2b543e51091974ba47b502439cf101fe52f49 Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Sun, 9 Mar 2014 23:27:46 +0100
 Subject: [PATCH] Refactor service readiness notification
@@ -29,7 +29,7 @@ Change-Id: I80f325c9be9c171c2dc8d5526570bf64f0f87c78
  create mode 100644 keystone/openstack/common/systemd.py
 
 diff --git a/bin/keystone-all b/bin/keystone-all
-index 315f3c1..e541f74 100755
+index 7778e47..6f2b862 100755
 --- a/bin/keystone-all
 +++ b/bin/keystone-all
 @@ -46,7 +46,7 @@ from keystone.common import sql
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index 746d417..e4c5d6a 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -6,7 +6,7 @@
 %global with_doc %{!?_without_doc:1}%{?_without_doc:0}
 
 Name:           openstack-keystone
-Version:        2014.1.3
+Version:        2014.1.4
 Release:        1%{?dist}
 Summary:        OpenStack Identity Service
 
@@ -263,6 +263,9 @@ fi
 %endif
 
 %changelog
+* Wed Mar 18 2015 Alan Pevec <alan.pevec at redhat.com> 2014.1.4-1
+- Update to upstream 2014.1.4
+
 * Mon Jan 19 2015 Alan Pevec <alan.pevec at redhat.com> 2014.1.3-1
 - Update to upstream 2014.1.3
 
diff --git a/sources b/sources
index c24a7dc..04b090e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7cf290976596515474e9af64f8167fb0  keystone-2014.1.3.tar.gz
+62193e74ae6f84040ebe69983971f0a5  keystone-2014.1.4.tar.gz