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

[Alan Pevec]

commit 29f68444d13f37cfbb929dd6ff9a83dff558b055
Merge: c6c2983 41767d1
Author: Alan Pevec <apevec at redhat.com>
Date:   Mon May 13 17:41:06 2013 +0200

    Merge branch 'master' into el6-grizzly

 .gitignore              |    1 +
 openstack-keystone.spec |    9 ++++++---
 sources                 |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --cc openstack-keystone.spec
index 87ac73f,5731367..a77d666
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -14,14 -14,12 +14,14 @@@ License:        ASL 2.
  URL:            http://keystone.openstack.org/
  Source0:        http://launchpad.net/keystone/%{release_name}/%{version}/+download/keystone-%{version}.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=2013.1
+ # patches_base=2013.1.1
  #
  
  BuildArch:      noarch