OpenStack Compute (nova)

Merge lp://qastaging/~cbehrens/nova/lp844155 into lp://qastaging/~hudson-openstack/nova/trunk

  1. lp844155
  2. Merge into trunk
Proposed by Chris Behrens
Status: Merged
Approved by: Josh Kearney
Approved revision: 1535
Merged at revision: 1536
Proposed branch: lp://qastaging/~cbehrens/nova/lp844155
Merge into: lp://qastaging/~hudson-openstack/nova/trunk
Diff against target: 46 lines (+22/-3)
2 files modified
nova/scheduler/abstract_scheduler.py (+0/-3)
nova/tests/scheduler/test_abstract_scheduler.py (+22/-0)
To merge this branch: bzr merge lp://qastaging/~cbehrens/nova/lp844155
Reviewer Review Type Date Requested Status
Josh Kearney (community) Approve
Sandy Walsh (community) Approve
Review via email: mp+74542@code.qastaging.launchpad.net

Description of the change

Fix lp:844155

When using an abstract scheduler class, if no compute hosts are available locally, the checking of child zones is short circuited. I've removed the broken check.

To post a comment you must log in.
Revision history for this message
Sandy Walsh (sandy-walsh) wrote :

makes sense

review: Approve
Revision history for this message
Josh Kearney (jk0) wrote :

LGTM

review: Approve
Revision history for this message
OpenStack Infra (hudson-openstack) wrote :

Attempt to merge into lp:nova failed due to conflicts:

text conflict in nova/tests/scheduler/test_abstract_scheduler.py

Revision history for this message
Chris Behrens (cbehrens) wrote :

Merged trunk and resolved conflict.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.