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

[Alan Pevec]

commit 20e9e4530124328d7ca43bdb7a411f106000de7c
Merge: b37e7f0 77791bd
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Nov 30 11:25:10 2012 +0100

    Merge branch 'f18' into el6

 .gitignore                                         |    2 +-
 0001-match-egg-and-spec-requires.patch             |    8 ++++----
 0002-add-Quantum-endpoint-in-sample-data.patch     |    6 +++---
 0003-add-Swift-endpoint-in-sample-data.patch       |    6 +++---
 ...ify-calling-process-we-are-ready-to-serve.patch |    6 +++---
 ...Fix-default-port-for-identity.internalURL.patch |    2 +-
 openstack-keystone.spec                            |   19 ++++++++++---------
 sources                                            |    2 +-
 8 files changed, 26 insertions(+), 25 deletions(-)
---
diff --cc openstack-keystone.spec
index 492aa4c,9527435..49a65b2
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -22,14 -20,12 +20,14 @@@ Source0:        http://launchpad.net/ke
  #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
+ # patches_base=2012.2.1
  #
  Patch0001: 0001-match-egg-and-spec-requires.patch
  Patch0002: 0002-add-Quantum-endpoint-in-sample-data.patch