Merge lp://qastaging/~mpontillo/maas/fix-dhcp-tests--bug-1699286--2.2 into lp://qastaging/maas/2.2
Proposed by
Mike Pontillo
| Status: | Merged |
|---|---|
| Approved by: | Mike Pontillo |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 6065 |
| Proposed branch: | lp://qastaging/~mpontillo/maas/fix-dhcp-tests--bug-1699286--2.2 |
| Merge into: | lp://qastaging/maas/2.2 |
| Diff against target: |
72 lines (+17/-11) 1 file modified
src/provisioningserver/dhcp/tests/test_config.py (+17/-11) |
| To merge this branch: | bzr merge lp://qastaging/~mpontillo/maas/fix-dhcp-tests--bug-1699286--2.2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike Pontillo (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge revision 6096 from trunk to fix DHCP NTP configuration tests.
Note that no changelog entry is necessary for this change; it is developer-facing only.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Self-review backport.