Merge lp://staging/~allenap/maas/ntp-service-flip-flop into lp://staging/~maas-committers/maas/trunk
Proposed by
Gavin Panella
Status: | Merged |
---|---|
Approved by: | Gavin Panella |
Approved revision: | no longer in the source branch. |
Merged at revision: | 5428 |
Proposed branch: | lp://staging/~allenap/maas/ntp-service-flip-flop |
Merge into: | lp://staging/~maas-committers/maas/trunk |
Diff against target: |
308 lines (+52/-36) 10 files modified
src/maasserver/models/service.py (+4/-3) src/maasserver/regiondservices/ntp.py (+1/-1) src/maasserver/regiondservices/tests/test_ntp.py (+2/-2) src/maasserver/service_monitor.py (+5/-5) src/maasserver/static/partials/node-details.html (+10/-3) src/maasserver/tests/test_service_monitor.py (+3/-2) src/provisioningserver/rackdservices/ntp.py (+1/-1) src/provisioningserver/rackdservices/tests/test_ntp.py (+2/-2) src/provisioningserver/service_monitor.py (+9/-6) src/provisioningserver/tests/test_service_monitor.py (+15/-11) |
To merge this branch: | bzr merge lp://staging/~allenap/maas/ntp-service-flip-flop |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andres Rodriguez (community) | Approve | ||
Review via email: mp+307323@code.staging.launchpad.net |
Commit message
Record status information for NTP under different names for region and rack.
To post a comment you must log in.
lgtm!