Merge lp:~cerberus/nova/bad_auth_token_userid into lp:~hudson-openstack/nova/trunk

Proposed by Matt Dietz
Status: Merged
Approved by: Eric Day
Approved revision: 507
Merged at revision: 508
Proposed branch: lp:~cerberus/nova/bad_auth_token_userid
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
nova/db/sqlalchemy/models.py (+1/-1)
To merge this branch: bzr merge lp:~cerberus/nova/bad_auth_token_userid
Reviewer Review Type Date Requested Status
Eric Day (community) Approve
Devin Carlen (community) Approve
Review via email: mp+44927@code.launchpad.net

Description of the change

Auth Tokens assumed the user_id was an int, not a string.

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

review: Approve
Revision history for this message
Eric Day (eday) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/db/sqlalchemy/models.py'
2--- nova/db/sqlalchemy/models.py 2010-12-22 21:17:30 +0000
3+++ nova/db/sqlalchemy/models.py 2010-12-30 23:14:53 +0000
4@@ -452,7 +452,7 @@
5 """
6 __tablename__ = 'auth_tokens'
7 token_hash = Column(String(255), primary_key=True)
8- user_id = Column(Integer)
9+ user_id = Column(String(255))
10 server_manageent_url = Column(String(255))
11 storage_url = Column(String(255))
12 cdn_management_url = Column(String(255))