Merge lp:~corey.bryant/keystone/2014.1.3 into lp:~ubuntu-server-dev/keystone/icehouse

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-11 15:04:18 +0000
+++ debian/changelog	2014-10-03 16:14:37 +0000
@@ -1,3 +1,28 @@
+keystone (1:2014.1.3-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (8485dbc) (LP: #1377136):
+    - [89ebfe9] Fix tests comparing tokens
+    - [6bf25d0] Fix typo on cache backend module
+    - [1c8f9f9] Set LDAP certificate trust options for LDAPS and TLS
+    - [878f12e] Adds a whitelist for endpoint catalog substitution
+    - [a391713] Remove extraenous instantiations of managers
+    - [25cbcf5] Avoid conversion of binary LDAP values
+    - [b3765d7] Catalog driver generates v3 catalog from v2 catalog
+    - [824f66d] Ensure token is a string
+    - [30f9247] Add workaround to support tox 1.7.2
+    - [80502d3] Fixes catalog URL formatting to never return None
+    - [f3198d8] Updates keystone.catalog.core.format_url tests
+    - [c959cbd] Ignore broken endpoints in get_catalog
+    - [126440d] Ignore broken endpoints in get_v3_catalog
+    - [c48ec38] No longer allow listing users by email
+    - [18d4843] Fixes an issue with the XMLEquals matcher
+    - [c6cd627] Implicitly ignore attributes that are mapped to None in LDAP
+    - [8485dbc] Remove `with_lockmode` use from Trust SQL backend.
+  * d/p/fix-requirements.patch: Rebased.
+  * d/p/add-version-info.patch: Rebased.
+
+ -- Corey Bryant <[e-mail]>  Fri, 03 Oct 2014 09:12:05 -0400
+
 keystone (1:2014.1.2.1-0ubuntu1) trusty; urgency=medium
 
   [ Corey Bryant ]

=== modified file 'debian/patches/add-version-info.patch'
--- debian/patches/add-version-info.patch	2014-03-28 11:38:43 +0000
+++ debian/patches/add-version-info.patch	2014-10-03 16:14:37 +0000
@@ -1,18 +1,16 @@
 Description: Add version info for Ubuntu.
 Author: Yolanda Robla <[e-mail]>
 Forwarded: Not-needed
-diff -Naurp keystone-2014.1.rc1.orig/etc/keystone.conf.sample keystone-2014.1.rc1/etc/keystone.conf.sample
---- keystone-2014.1.rc1.orig/etc/keystone.conf.sample	2014-03-27 04:48:32.000000000 -0400
-+++ keystone-2014.1.rc1/etc/keystone.conf.sample	2014-03-27 16:08:57.519481000 -0400
-@@ -1334,3 +1334,5 @@
+--- a/etc/keystone.conf.sample
++++ b/etc/keystone.conf.sample
+@@ -1335,3 +1335,5 @@
  #driver=keystone.trust.backends.sql.Trust
  
  
 +[extra_headers]
 +Distribution = Ubuntu
-diff -Naurp keystone-2014.1.rc1.orig/keystone/common/config.py keystone-2014.1.rc1/keystone/common/config.py
---- keystone-2014.1.rc1.orig/keystone/common/config.py	2014-03-27 04:48:32.000000000 -0400
-+++ keystone-2014.1.rc1/keystone/common/config.py	2014-03-27 16:11:26.199481000 -0400
+--- a/keystone/common/config.py
++++ b/keystone/common/config.py
 @@ -12,6 +12,8 @@
  # License for the specific language governing permissions and limitations
  # under the License.
@@ -22,19 +20,18 @@
  from oslo.config import cfg
  
  
-@@ -641,6 +643,8 @@ FILE_OPTIONS = {
-         cfg.IntOpt('list_limit', default=None,
-                    help='Maximum number of entities that will be returned '
-                         'in a catalog collection.')],
+@@ -651,6 +653,8 @@
+                          'this list. It will give users with permission to '
+                          'create endpoints the ability to see those values '
+                          'in your configuration file.')],
 +    'extra_headers': [
 +        cfg.StrOpt('Distribution', default=platform.dist()[0])],
      'kvs': [
          cfg.ListOpt('backends', default=[],
                      help='Extra dogpile.cache backend modules to register '
-diff -Naurp keystone-2014.1.rc1.orig/keystone/common/wsgi.py keystone-2014.1.rc1/keystone/common/wsgi.py
---- keystone-2014.1.rc1.orig/keystone/common/wsgi.py	2014-03-27 04:48:32.000000000 -0400
-+++ keystone-2014.1.rc1/keystone/common/wsgi.py	2014-03-27 16:12:07.751481000 -0400
-@@ -582,6 +582,11 @@ def render_response(body=None, status=No
+--- a/keystone/common/wsgi.py
++++ b/keystone/common/wsgi.py
+@@ -588,6 +588,11 @@
      headers = headers or []
      headers.append(('Vary', 'X-Auth-Token'))
  

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2014-08-11 12:37:33 +0000
+++ debian/patches/fix-requirements.patch	2014-10-03 16:14:37 +0000
@@ -1,8 +1,6 @@
 Description: Set min version of six.
 Author: Corey Bryant <[e-mail]>
 Forwarded: Not needed.
-Index: keystone/requirements.txt
-===================================================================
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -7,7 +7,7 @@
@@ -12,5 +10,5 @@
 -six>=1.6.0
 +six>=1.5.2
  SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
- sqlalchemy-migrate>=0.8.2,!=0.8.4
+ sqlalchemy-migrate>=0.8.2,!=0.8.4,!=0.9.2
  passlib