Merge lp:~jtv/maas/1.6-bug-1354511 into lp:~maas-committers/maas/trunk
Proposed by
Jeroen T. Vermeulen
Status: | Superseded |
---|---|
Proposed branch: | lp:~jtv/maas/1.6-bug-1354511 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
139 lines (+52/-14) (has conflicts) 4 files modified
src/maasserver/rpc/tests/test_regionservice.py (+27/-12) src/provisioningserver/drivers/osystem/ubuntu.py (+1/-2) src/provisioningserver/import_images/boot_resources.py (+15/-0) src/provisioningserver/upgrade_cluster.py (+9/-0) Text conflict in src/maasserver/rpc/tests/test_regionservice.py Text conflict in src/provisioningserver/import_images/boot_resources.py Text conflict in src/provisioningserver/upgrade_cluster.py |
To merge this branch: | bzr merge lp:~jtv/maas/1.6-bug-1354511 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
MAAS Maintainers | Pending | ||
Review via email: mp+230175@code.launchpad.net |
This proposal has been superseded by a proposal from 2014-08-08.
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.