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

[Corey Bryant]

Ubuntu Stable Release Update for OpenStack Icehouse

[lp:~corey.bryant/keystone/2014.1.1]

277. By Corey Bryant on 2014-06-13

* Resynchronize with stable/icehouse (1716748) (LP: #1328134):
  - [4408625] sql migration: ensure using innodb utf8 for assignment table
  - [786af98] SQL and LDAP fixes for get_roles_for_user_and_project user=group ID
  - [e56fe4c] Updated from global requirements
  - [0bd819c] Removed duplication with list_user_ids_for_project
  - [b932321] Allow any attributes in mapping and include in results
  - [1716748] Treat LDAP attribute names as case-insensitive

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-17 09:27:33 +0000
+++ debian/changelog	2014-06-13 17:55:26 +0000
@@ -1,3 +1,15 @@
+keystone (1:2014.1.1-0ubuntu1) trusty; urgency=medium
+
+  * Resynchronize with stable/icehouse (1716748) (LP: #1328134):
+    - [4408625] sql migration: ensure using innodb utf8 for assignment table
+    - [786af98] SQL and LDAP fixes for get_roles_for_user_and_project user=group ID
+    - [e56fe4c] Updated from global requirements
+    - [0bd819c] Removed duplication with list_user_ids_for_project
+    - [b932321] Allow any attributes in mapping and include in results
+    - [1716748] Treat LDAP attribute names as case-insensitive
+
+ -- Corey Bryant <[e-mail]>  Mon, 09 Jun 2014 15:57:33 -0400
+
 keystone (1:2014.1-0ubuntu1) trusty; urgency=medium
 
   * New upstream release (LP: #1298959).
 
=== added file 'debian/patches/fix-requirements.patch'
--- debian/patches/fix-requirements.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-requirements.patch	2014-06-13 17:55:26 +0000
@@ -0,0 +1,16 @@
+Description: Set min version of six.
+Author: Corey Bryant <[e-mail]>
+Forwarded: Not needed.
+Index: keystone/requirements.txt
+===================================================================
+--- keystone.orig/requirements.txt	2014-06-13 10:14:20.196555030 -0400
++++ keystone/requirements.txt	2014-06-13 11:48:22.840383005 -0400
+@@ -7,7 +7,7 @@
+ PasteDeploy>=1.5.0
+ Paste
+ Routes>=1.12.3
+-six>=1.6.0
++six>=1.5.2
+ SQLAlchemy>=0.7.8,<=0.9.99
+ sqlalchemy-migrate>=0.8.2,!=0.8.4
+ passlib
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-28 11:38:43 +0000
+++ debian/patches/series	2014-06-13 17:55:26 +0000
@@ -2,3 +2,4 @@
 sql_connection.patch
 add-version-info.patch
 ubuntu-test-overrides.patch
+fix-requirements.patch