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

[Alan Pevec]

commit a94fd08005182f672a0fcc8115885c4f98536222
Merge: 20e9e45 a4050bb
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon Feb 4 13:10:25 2013 +0100

    Merge branch 'f18' into el6

 .gitignore              |    2 +-
 openstack-keystone.spec |   13 ++++++-------
 sources                 |    2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --cc openstack-keystone.spec
index 49a65b2,c397e8f..89af525
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -18,16 -15,13 +15,15 @@@ License:        ASL 2.
  URL:            http://keystone.openstack.org/
  Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.tar.gz
  #Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
- #Source0:        http://tarballs.openstack.org/keystone/keystone-%{version}%{snaptag}.tar.gz
  Source1:        openstack-keystone.logrotate
 -Source2:        openstack-keystone.service
 +Source2:        openstack-keystone.init
 +Source3:        openstack-keystone.upstart
  Source5:        openstack-keystone-sample-data
  
 +Patch0:       openstack-keystone-newdeps.patch
  
  #
- # patches_base=2012.2.1
+ # patches_base=2012.2.3
  #
  Patch0001: 0001-match-egg-and-spec-requires.patch
  Patch0002: 0002-add-Quantum-endpoint-in-sample-data.patch