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

[Corey Bryant]

=== modified file 'debian/changelog'
--- debian/changelog	2015-03-30 13:08:06 +0000
+++ debian/changelog	2015-06-22 16:02:33 +0000
@@ -1,3 +1,15 @@
+keystone (1:2014.1.5-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/icehouse (91255f1) (LP: #1467533):
+    - [a1548eb] backend_argument should be marked secret
+    - [e6eba4b] Remove oslo.serialization from requirements.txt
+    - [0e0efdb] Work with pymongo 3.0
+    - [91255f1] Deal with PEP-0476 certificate chaining checking
+  * d/p/drop-oslo-serialization.patch: Dropped; Fixed upstream.
+  * d/p/fix-requirements.patch: Rebased
+
+ -- Corey Bryant <[e-mail]>  Mon, 22 Jun 2015 10:14:38 -0400
+
 keystone (1:2014.1.4-0ubuntu2) trusty; urgency=medium
 
   * d/p/drop-oslo-serialization.patch: Drop oslo.serialization (LP: #1437741).

=== removed file 'debian/patches/drop-oslo-serialization.patch'
--- debian/patches/drop-oslo-serialization.patch	2015-03-29 15:14:23 +0000
+++ debian/patches/drop-oslo-serialization.patch	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-Description: Remove oslo.serialization from requirements.txt
-             Change I00f66b0f3c8e9f688429ee78bd51608a4dcac140 added
-             oslo.serialization to requirements.txt on stable to unwedge
-             the gate due to keystone on stable testing against master
-             level keystoneclient which required oslo.serialization.
-Author: Matt Riedemann <[e-mail]>
-Origin: https://review.openstack.org/#/c/165928/
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+bug/1437741
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -16,8 +16,6 @@
- python-keystoneclient>=0.7.0,<=0.11.2
- oslo.config>=1.2.0,<1.5
- oslo.messaging>=1.3.0,<1.5
--# only for Keystone tests running against keystoneclient master
--oslo.serialization>=0.1.0,<1.1               # Apache-2.0
- Babel>=1.3
- oauthlib>=0.6
- dogpile.cache>=0.5.0

=== modified file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	2015-03-16 20:49:27 +0000
+++ debian/patches/fix-requirements.patch	2015-06-22 16:02:33 +0000
@@ -4,11 +4,11 @@
 --- a/requirements.txt
 +++ b/requirements.txt
 @@ -7,7 +7,7 @@
- PasteDeploy>=1.5.0
+ PasteDeploy>=1.5.0,<=1.5.2
  Paste
  Routes>=1.12.3,!=2.0
--six>=1.6.0
-+six>=1.5.2
+-six>=1.6.0,<=1.9.0
++six>=1.5.2,<=1.9.0
  SQLAlchemy>=0.7.8,!=0.9.5,<=0.9.99
  sqlalchemy-migrate>=0.8.2,!=0.8.4,<=0.9.1
  passlib

=== modified file 'debian/patches/series'
--- debian/patches/series	2015-03-29 15:14:23 +0000
+++ debian/patches/series	2015-06-22 16:02:33 +0000
@@ -1,4 +1,3 @@
-drop-oslo-serialization.patch
 fix-requirements.patch
 fix-ubuntu-tests.patch
 sql_connection.patch