Merge lp:~vishvananda/nova/clean-compute into lp:~hudson-openstack/nova/trunk
Proposed by
Vish Ishaya
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Eric Day | ||||||||
Approved revision: | 570 | ||||||||
Merged at revision: | 568 | ||||||||
Proposed branch: | lp:~vishvananda/nova/clean-compute | ||||||||
Merge into: | lp:~hudson-openstack/nova/trunk | ||||||||
Prerequisite: | lp:~vishvananda/nova/lp703012 | ||||||||
Diff against target: |
101 lines (+13/-28) 3 files modified
nova/api/ec2/cloud.py (+1/-17) nova/compute/api.py (+10/-9) nova/network/manager.py (+2/-2) |
||||||||
To merge this branch: | bzr merge lp:~vishvananda/nova/clean-compute | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Day (community) | Approve | ||
Devin Carlen (community) | Approve | ||
Review via email:
|
Description of the change
This branch fixes two outstanding bugs in compute. It also fixes a bad method signature in network and removes an unused method in cloud.
To post a comment you must log in.
ec2/cloud.py can have 'import rpc' removed now... \o/
otherwise, lgtm