Merge lp:~jtv/maas/1.5-bug-1354511 into lp:maas/1.5
Proposed by
Jeroen T. Vermeulen
Status: | Merged |
---|---|
Approved by: | Jeroen T. Vermeulen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2296 |
Proposed branch: | lp:~jtv/maas/1.5-bug-1354511 |
Merge into: | lp:maas/1.5 |
Diff against target: |
162 lines (+76/-21) 2 files modified
src/maasserver/api.py (+28/-9) src/maasserver/tests/test_api_commissioning.py (+48/-12) |
To merge this branch: | bzr merge lp:~jtv/maas/1.5-bug-1354511 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jeroen T. Vermeulen (community) | Approve | ||
Review via email: mp+230177@code.launchpad.net |
Commit message
Backport trunk r2668: When timing out nodes that haven't finished commissioning, compare the last-update timestamp to the database clock (from which it was also generated), not to the Python-side clock. Timezone skew between the two could cause nodes to time out immediately, or hours late.
Description of the change
Straight backport. For self-approval.
Jeroen
To post a comment you must log in.
Self-approving.