Merge lp://staging/~vishvananda/nova/milestone816612 into lp://staging/~hudson-openstack/nova/milestone-proposed
Proposed by
Vish Ishaya
| Status: | Merged |
|---|---|
| Approved by: | Thierry Carrez |
| Approved revision: | 1135 |
| Merged at revision: | 1135 |
| Proposed branch: | lp://staging/~vishvananda/nova/milestone816612 |
| Merge into: | lp://staging/~hudson-openstack/nova/milestone-proposed |
| Diff against target: |
28 lines (+3/-2) 2 files modified
nova/compute/manager.py (+1/-1) nova/network/api.py (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~vishvananda/nova/milestone816612 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Thierry Carrez | Approve | ||
|
Review via email:
|
|||
Description of the change
Cherry-pick of tr3buchet's fix for add_fixed_
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Fixed in trunk -- let's get this into Diablo-3