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

[Alan Pevec]

commit b1cb0c27cf8f0589784dcc615db3ee2997c5b902
Merge: e5cb28f 6d53c15
Author: Alan Pevec <apevec at redhat.com>
Date:   Fri Jan 24 22:22:35 2014 +0100

    Merge branch 'master' into el6-icehouse

 .gitignore                                         |    1 +
 0001-remove-runtime-dep-on-python-pbr.patch        |   38 +++++++++++--------
 ...-parameter-values-with-keystone-dist.conf.patch |   20 +++++-----
 keystone-dist.conf                                 |    2 +-
 openstack-keystone.spec                            |   18 ++++++---
 sources                                            |    2 +-
 6 files changed, 47 insertions(+), 34 deletions(-)
---
diff --cc keystone-dist.conf
index e6534de,c337055..2f7e2ed
--- a/keystone-dist.conf
+++ b/keystone-dist.conf
@@@ -1,7 -1,8 +1,7 @@@
  [DEFAULT]
  log_file = /var/log/keystone/keystone.log
 -onready = keystone.common.systemd
  
- [sql]
+ [database]
  connection = mysql://keystone:keystone@localhost/keystone
  
  [identity]