Merge lp:~vishvananda/nova/fix-token into lp:~hudson-openstack/nova/trunk
Proposed by
Vish Ishaya
Status: | Merged |
---|---|
Approved by: | Matt Dietz |
Approved revision: | 1082 |
Merged at revision: | 1084 |
Proposed branch: | lp:~vishvananda/nova/fix-token |
Merge into: | lp:~hudson-openstack/nova/trunk |
Diff against target: |
146 lines (+71/-11) 4 files modified
nova/api/openstack/auth.py (+7/-10) nova/db/sqlalchemy/migrate_repo/versions/018_rename_server_management_url.py (+60/-0) nova/db/sqlalchemy/models.py (+1/-1) nova/tests/api/openstack/fakes.py (+3/-0) |
To merge this branch: | bzr merge lp:~vishvananda/nova/fix-token |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matt Dietz (community) | Approve | ||
Dan Prince (community) | Approve | ||
Review via email: mp+61304@code.launchpad.net |
Description of the change
Fixes the naming of the server_
To post a comment you must log in.
Hey Vish,
The number 017 for migrations was already taken today by '017_make_ instance_ type_id_ an_integer. py'.
Can you bump this one to 18?
Dan