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

Proposed by Corey Bryant on 2014-06-09
Status: Merged
Merged at revision: 277
Proposed branch: lp:~corey.bryant/keystone/2014.1.1
Merge into: lp:~ubuntu-server-dev/keystone/icehouse
Diff against target: 49 lines (+29/-0)
3 files modified
debian/changelog (+12/-0)
debian/patches/fix-requirements.patch (+16/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~corey.bryant/keystone/2014.1.1
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2014-06-09 Pending
Review via email: mp+222569@code.launchpad.net

Description of the change

Ubuntu Stable Release Update for OpenStack Icehouse

To post a comment you must log in.
lp:~corey.bryant/keystone/2014.1.1 updated on 2014-06-13
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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-04-17 09:27:33 +0000
3+++ debian/changelog 2014-06-13 17:55:26 +0000
4@@ -1,3 +1,15 @@
5+keystone (1:2014.1.1-0ubuntu1) trusty; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (1716748) (LP: #1328134):
8+ - [4408625] sql migration: ensure using innodb utf8 for assignment table
9+ - [786af98] SQL and LDAP fixes for get_roles_for_user_and_project user=group ID
10+ - [e56fe4c] Updated from global requirements
11+ - [0bd819c] Removed duplication with list_user_ids_for_project
12+ - [b932321] Allow any attributes in mapping and include in results
13+ - [1716748] Treat LDAP attribute names as case-insensitive
14+
15+ -- Corey Bryant <corey.bryant@canonical.com> Mon, 09 Jun 2014 15:57:33 -0400
16+
17 keystone (1:2014.1-0ubuntu1) trusty; urgency=medium
18
19 * New upstream release (LP: #1298959).
20
21=== added file 'debian/patches/fix-requirements.patch'
22--- debian/patches/fix-requirements.patch 1970-01-01 00:00:00 +0000
23+++ debian/patches/fix-requirements.patch 2014-06-13 17:55:26 +0000
24@@ -0,0 +1,16 @@
25+Description: Set min version of six.
26+Author: Corey Bryant <corey.bryant@canonical.com>
27+Forwarded: Not needed.
28+Index: keystone/requirements.txt
29+===================================================================
30+--- keystone.orig/requirements.txt 2014-06-13 10:14:20.196555030 -0400
31++++ keystone/requirements.txt 2014-06-13 11:48:22.840383005 -0400
32+@@ -7,7 +7,7 @@
33+ PasteDeploy>=1.5.0
34+ Paste
35+ Routes>=1.12.3
36+-six>=1.6.0
37++six>=1.5.2
38+ SQLAlchemy>=0.7.8,<=0.9.99
39+ sqlalchemy-migrate>=0.8.2,!=0.8.4
40+ passlib
41
42=== modified file 'debian/patches/series'
43--- debian/patches/series 2014-03-28 11:38:43 +0000
44+++ debian/patches/series 2014-06-13 17:55:26 +0000
45@@ -2,3 +2,4 @@
46 sql_connection.patch
47 add-version-info.patch
48 ubuntu-test-overrides.patch
49+fix-requirements.patch

Subscribers

People subscribed via source and target branches