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

[Alan Pevec]

commit b37e7f045f027fbfc0718d52cfb52bf3a55e9447
Merge: cd3fe9f 249ed7d
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Nov 16 21:36:24 2012 +0100

    Merge branch 'master' into el6

 openstack-keystone.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc openstack-keystone.spec
index 47748d1,0abd389..492aa4c
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@@ -226,8 -200,8 +226,8 @@@ f
  %{_bindir}/keystone-manage
  %{_bindir}/openstack-keystone-sample-data
  %{_datadir}/%{name}
 -%{_unitdir}/openstack-keystone.service
 +%{_initrddir}/openstack-keystone
- %dir %{_sysconfdir}/keystone
+ %dir %attr(0750, root, keystone) %{_sysconfdir}/keystone
  %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/keystone.conf
  %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/logging.conf
  %config(noreplace) %attr(-, root, keystone) %{_sysconfdir}/keystone/default_catalog.templates