[openstack-keystone] Updated patches from master-patches

[Alan Pevec]

commit d700f0033410a490a8c25931a09b8598dbd88869
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Sep 9 19:18:01 2013 +0200

    Updated patches from master-patches

 0001-remove-runtime-dep-on-python-pbr.patch        |    3 +--
 ...oslo.sphinx-and-remove-local-copy-of-doc-.patch |    7 +------
 ...-parameter-values-with-keystone-dist.conf.patch |    3 +--
 3 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/0001-remove-runtime-dep-on-python-pbr.patch b/0001-remove-runtime-dep-on-python-pbr.patch
index 1b87d87..3c5f9f7 100644
--- a/0001-remove-runtime-dep-on-python-pbr.patch
+++ b/0001-remove-runtime-dep-on-python-pbr.patch
@@ -1,9 +1,8 @@
-From d6a4ef10dc20d440ef94dab39313959cd6ccb4d8 Mon Sep 17 00:00:00 2001
+From 3b50184045190a3b0605eece06b37ff99972a083 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
 
-Change-Id: Id5cf8a58902d35afdb3d9fc5a5abd83697b53ca5
 ---
  bin/keystone-all | 3 +--
  keystone/cli.py  | 3 +--
diff --git a/0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index 7e5a260..4cc074d 100644
--- a/0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/0002-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1,14 +1,9 @@
-From 8aba354ffe16ff32e7a6b2364676b1b529831320 Mon Sep 17 00:00:00 2001
+From b47233d237dd695362975ddf3587bc327355f53d Mon Sep 17 00:00:00 2001
 From: Alan Pevec <apevec at redhat.com>
 Date: Mon, 9 Sep 2013 00:51:04 +0200
 Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
 
 This reverts commit ad58c0f899751ca08174965ab007c5fc6b2e1e5c.
-
-Conflicts:
-	test-requirements.txt
-
-Change-Id: I69a88d58d5b8a8bebc3db957196702a2dd1c56f3
 ---
  doc/source/_templates/.placeholder |  0
  doc/source/_theme/layout.html      | 83 ++++++++++++++++++++++++++++++++++++++
diff --git a/0003-sync-parameter-values-with-keystone-dist.conf.patch b/0003-sync-parameter-values-with-keystone-dist.conf.patch
index c4255d6..8c523e6 100644
--- a/0003-sync-parameter-values-with-keystone-dist.conf.patch
+++ b/0003-sync-parameter-values-with-keystone-dist.conf.patch
@@ -1,9 +1,8 @@
-From a822aae55ce0bbd488c25dc230ccb5109cf50c9c Mon Sep 17 00:00:00 2001
+From d55ad70e6319c50c0ddcbaadfe87fb8d00749f5d 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
 
-Change-Id: I0989b1579850e8a7cd2de4887cef1c753112dab8
 ---
  etc/keystone.conf.sample | 10 +++++-----
  1 file changed, 5 insertions(+), 5 deletions(-)