[openstack-keystone/el6: 2/2] Merge branch 'f17' into el6

[Alan Pevec]

commit 139b54339ce20ce8f298d29bd3539d851ba968e4
Merge: f5f2194 b351c0a
Author: Alan Pevec <apevec at redhat.com>
Date:   Sun Sep 16 10:15:20 2012 +0200

    Merge branch 'f17' into el6

 ...it-token-revocation-to-tenant-bug-1050025.patch |  212 ++++++++++++++++++++
 openstack-keystone.spec                            |    7 +-
 2 files changed, 218 insertions(+), 1 deletions(-)
---
diff --cc openstack-keystone.spec
index da31e78,ce0208b..980c18c
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -32,18 -29,14 +32,19 @@@ Patch0003: 0003-match-egg-and-spec-requ
  Patch0004: 0004-Require-authz-to-update-user-s-tenant-bug-1040626.patch
  Patch0005: 0005-List-tokens-for-memcached-backend.patch
  Patch0006: 0006-Delete-user-tokens-after-role-grant-revoke.patch
+ Patch0007: 0007-Limit-token-revocation-to-tenant-bug-1050025.patch
  
  BuildArch:      noarch
 +
  BuildRequires:  python2-devel
 -BuildRequires:  python-sphinx >= 1.0
 +BuildRequires:  python-sphinx10
  BuildRequires:  openstack-utils
  BuildRequires:  python-iniparse
 -BuildRequires:  systemd-units
 +# These are required to build due to the requirements check added
 +BuildRequires:  python-sqlalchemy0.7
 +BuildRequires:  python-webob1.0
 +BuildRequires:  python-paste-deploy1.5
 +BuildRequires:  python-routes1.12
  
  Requires:       python-keystone = %{version}-%{release}
  Requires:       python-keystoneclient >= 2012.1-0.4.e4