Merge lp://qastaging/~tpatil/nova/bug708822 into lp://qastaging/~hudson-openstack/nova/trunk
Proposed by
Tushar Patil
Status: | Work in progress |
---|---|
Proposed branch: | lp://qastaging/~tpatil/nova/bug708822 |
Merge into: | lp://qastaging/~hudson-openstack/nova/trunk |
Diff against target: |
20 lines (+8/-2) 1 file modified
nova/api/ec2/cloud.py (+8/-2) |
To merge this branch: | bzr merge lp://qastaging/~tpatil/nova/bug708822 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Soren Hansen (community) | Needs Information | ||
Rick Harris | Pending | ||
Vish Ishaya | Pending | ||
Review via email:
|
Commit message
Fix for LP Bug #708822
To post a comment you must log in.
Unmerged revisions
- 638. By Tushar Patil
-
Removed pep8 errors
- 637. By Tushar Patil
-
logic restructured as per review comments
- 636. By Tushar Patil
-
Merged with Trunk
- 635. By Tushar Patil
-
Fix for LP Bug #708822
- 634. By Tushar Patil
-
Merged with trunk
- 633. By Tushar Patil
-
Merged with Trunk
- 632. By Tushar Patil
-
Fix for LP Bug #708822
Can you explain why this makes a difference? I'm not sure why this fix would work?
Vish
On Jan 27, 2011, at 1:09 PM, Tushar Patil wrote:
> Tushar Patil has proposed merging lp:~tpatil/nova/bug708822 into lp:nova. ilityZones: services alive status is not consistent /bugs.launchpad .net/bugs/ 708822 /code.launchpad .net/~tpatil/ nova/bug708822/ +merge/ 47729 /code.launchpad .net/~tpatil/ nova/bug708822/ +merge/ 47729 ec2/cloud. py' ec2/cloud. py 2011-01-27 08:30:24 +0000 ec2/cloud. py 2011-01-27 21:08:54 +0000 down_time) FLAGS.service_ down_time)
>
> Requested reviews:
> Nova Core (nova-core)
> Related bugs:
> #708822 DescribeAvailab
> https:/
>
> For more details, see:
> https:/
> --
> https:/
> You are subscribed to branch lp:nova.
> === modified file 'nova/api/
> --- nova/api/
> +++ nova/api/
> @@ -236,7 +236,9 @@
> if service['host'] == host]
> for svc in hsvcs:
> delta = now - (svc['updated_at'] or svc['created_at'])
> - alive = (delta.seconds <= FLAGS.service_
> + alive = delta < datetime.timedelta(
> + seconds=
> +
> art = (alive and ":-)") or "XXX"
> active = 'enabled'
> if svc['disabled']:
>