OpenStack Compute (nova)

Merge lp:~sandy-walsh/nova/lp781878 into lp:~hudson-openstack/nova/trunk

  1. lp781878
  2. Merge into trunk
Proposed by Sandy Walsh
Status: Merged
Approved by: Vish Ishaya
Approved revision: 1067
Merged at revision: 1068
Proposed branch: lp:~sandy-walsh/nova/lp781878
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+2/-1)
1 file modified
nova/compute/manager.py (+2/-1)
To merge this branch: bzr merge lp:~sandy-walsh/nova/lp781878
Reviewer Review Type Date Requested Status
Vish Ishaya (community) Approve
Dan Prince (community) Approve
Ed Leafe (community) Approve
Review via email: mp+60857@code.launchpad.net

Description of the change

Lost a flag pulling from another branch. Whoops.

To post a comment you must log in.
Revision history for this message
Ed Leafe (ed-leafe) wrote :

Don't know how we missed this before... but this lgtm.

review: Approve
Revision history for this message
Dan Prince (dan-prince) wrote :

That will fix it. Thanks Sandy.

review: Approve
Revision history for this message
Vish Ishaya (vishvananda) wrote :

looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/compute/manager.py'
2--- nova/compute/manager.py 2011-05-11 00:11:27 +0000
3+++ nova/compute/manager.py 2011-05-13 03:09:27 +0000
4@@ -77,7 +77,8 @@
5 " Set to 0 to disable.")
6 flags.DEFINE_bool('auto_assign_floating_ip', False,
7 'Autoassigning floating ip to VM')
8-
9+flags.DEFINE_integer('host_state_interval', 120,
10+ 'Interval in seconds for querying the host status')
11
12 LOG = logging.getLogger('nova.compute.manager')
13