diff options
| author | Dolph Mathews <dolph.mathews@rackspace.com> | 2011-08-16 09:59:57 -0500 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@rackspace.com> | 2011-08-16 09:59:57 -0500 |
| commit | 10d824624dc3a3558fa9bfda3e4f9b6941f89199 (patch) | |
| tree | ebe20fe25ed214aa3323936ca9a9eb56b8243163 | |
| parent | 920298f5e864299f5321871ab6d6e8bdd7195503 (diff) | |
Creating an artificial whitespace merge conflict
Change-Id: I784d585d1dad3936e237ebea0a05ac5fa6b65a2c
| -rwxr-xr-x | keystone/test/etc/ldap.conf.template | 8 | ||||
| -rw-r--r-- | keystone/test/etc/memcache.conf.template | 8 | ||||
| -rw-r--r-- | keystone/test/etc/sql.conf.template | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/keystone/test/etc/ldap.conf.template b/keystone/test/etc/ldap.conf.template index 8cf30e10..9537ec33 100755 --- a/keystone/test/etc/ldap.conf.template +++ b/keystone/test/etc/ldap.conf.template @@ -28,13 +28,13 @@ backend_entities = ['Tenant', 'User', 'UserRoleAssociation', 'Role'] [pipeline:admin] pipeline = - urlrewritefilter - admin_api + urlrewritefilter + admin_api [pipeline:keystone-legacy-auth] pipeline = - urlrewritefilter - legacy_auth + urlrewritefilter + legacy_auth service_api [app:service_api] diff --git a/keystone/test/etc/memcache.conf.template b/keystone/test/etc/memcache.conf.template index ffe8647d..e2f668e4 100644 --- a/keystone/test/etc/memcache.conf.template +++ b/keystone/test/etc/memcache.conf.template @@ -27,13 +27,13 @@ cache_time = 86400 [pipeline:admin] pipeline = - urlrewritefilter - admin_api + urlrewritefilter + admin_api [pipeline:keystone-legacy-auth] pipeline = - urlrewritefilter - legacy_auth + urlrewritefilter + legacy_auth service_api [app:service_api] diff --git a/keystone/test/etc/sql.conf.template b/keystone/test/etc/sql.conf.template index 6c887676..1d8bfedc 100644 --- a/keystone/test/etc/sql.conf.template +++ b/keystone/test/etc/sql.conf.template @@ -22,13 +22,13 @@ backend_entities = ['Endpoints', 'Credentials', 'EndpointTemplates', 'Tenant', [pipeline:admin] pipeline = - urlrewritefilter - admin_api + urlrewritefilter + admin_api [pipeline:keystone-legacy-auth] pipeline = - urlrewritefilter - legacy_auth + urlrewritefilter + legacy_auth service_api [app:service_api] |