← Back to branch summary

~corey.bryant/keystone/2014.1.1

« back to all changes in this revision

Viewing changes to debian/patches/fix-requirements.patch

  • Committer: Corey Bryant
  • Date: 2014-06-13 15:50:11 UTC
  • Revision ID: corey.bryant@canonical.com-20140613155011-bekoyyntch15psba
https://launchpad.net/bugs/1328134
* 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/fix-requirements.patch
 
1
Description: Set min version of six.
 
2
Author: Corey Bryant <corey.bryant@canonical.com>
 
3
Forwarded: Not needed.
 
4
Index: keystone/requirements.txt
 
5
===================================================================
 
6
--- keystone.orig/requirements.txt      2014-06-13 10:14:20.196555030 -0400
 
7
+++ keystone/requirements.txt   2014-06-13 11:48:22.840383005 -0400
 
8
@@ -7,7 +7,7 @@
 
9
 PasteDeploy>=1.5.0
 
10
 Paste
 
11
 Routes>=1.12.3
 
12
-six>=1.6.0
 
13
+six>=1.5.2
 
14
 SQLAlchemy>=0.7.8,<=0.9.99
 
15
 sqlalchemy-migrate>=0.8.2,!=0.8.4
 
16
 passlib