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

[Alan Pevec]

commit c50ee4af43edde92b1d9c2e2ae19d6b387f618bd
Merge: c2388c8 3c0b6ac
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Jun 15 20:42:50 2012 +0200

    Merge branch 'f17' into el6
    
    Conflicts:
    	openstack-keystone.spec

 openstack-keystone.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---
diff --cc openstack-keystone.spec
index a6fb81a,24510b2..4cfe953
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -11,7 -11,7 +11,7 @@@
  
  Name:           openstack-keystone
  Version:        2012.1
- Release:        7%{?dist}
 -Release:        5%{?dist}
++Release:        8%{?dist}
  #Release:       0.1.%{release_letter}%{milestone}%{?dist}
  Summary:        OpenStack Identity Service
  
@@@ -252,7 -236,10 +255,10 @@@ f
  %{python_sitelib}/keystone/middleware/auth_token.py*
  
  %changelog
 -* Fri Jun 15 2012 Alan Pevec <apevec at redhat.com> 2012.1-5
++* Fri Jun 15 2012 Alan Pevec <apevec at redhat.com> 2012.1-8
+ - fix upgrade case with python-keystone-auth-token (rhbz#824034#c20)
+ 
 -* Mon Jun 11 2012 Alan Pevec <apevec at redhat.com> 2012.1-4
 +* Mon Jun 11 2012 Alan Pevec <apevec at redhat.com> 2012.1-7
  - Corrects url conversion in export_legacy_catalog (lp#994936)
  - Invalidate user tokens when password is changed (lp#996595)
  - Invalidate user tokens when a user is disabled (lp#997194)