[openstack-keystone/el6: 4/4] Merge branch 'master' into el6

[Alan Pevec]

commit 9db99e27ac2ed4d991d12cb99923811208809a69
Merge: 747f965 3ee0967
Author: Alan Pevec <apevec at redhat.com>
Date:   Thu Apr 5 20:16:08 2012 +0200

    Merge branch 'master' into el6

 .gitignore              |    2 +-
 openstack-config-set    |    1 +
 openstack-keystone.spec |   22 +++++++++++++++-------
 sources                 |    2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)
---
diff --cc openstack-keystone.spec
index 9e1f78d,8c3e75e..ea8c05a
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -16,10 -17,11 +17,11 @@@ Summary:        OpenStack Identity Serv
  
  License:        ASL 2.0
  URL:            http://keystone.openstack.org/
- Source0:        http://launchpad.net/keystone/%{release_name}/%{release_name}-%{milestone}/+download/keystone-%{version}~%{release_letter}%{milestone}.tar.gz
+ Source0:        http://launchpad.net/keystone/%{release_name}/+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://keystone.openstack.org/tarballs/keystone-%{version}%{snaptag}.tar.gz
  Source1:        openstack-keystone.logrotate
 -Source2:        openstack-keystone.service
 +Source2:        openstack-keystone.init
  Source3:        openstack-keystone-db-setup
  Source4:        openstack-config-set
  Source5:        openstack-keystone-sample-data