← Back to branch summary

~maas-committers/maas/2.2

Viewing all changes in revision 6065.

  • Committer: MAAS Lander
  • Author(s): Mike Pontillo
  • Date: 2017-06-20 21:14:05 UTC
  • mfrom: (6064.1.2 fix-dhcp-tests--2.2)
  • Revision ID: maas_lander-20170620211405-npzcsfqao3mfbcj1
[r=mpontillo][bug=1699286][author=mpontillo] 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.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: