MAAS

Merge lp:~julian-edwards/maas/1.6-ntp-server-field-type-bug-1342135 into lp:maas/1.6

  1. 1.6-ntp-server-field-type-bug-1342135
  2. Merge into 1.6
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 2536
Proposed branch: lp:~julian-edwards/maas/1.6-ntp-server-field-type-bug-1342135
Merge into: lp:maas/1.6
Diff against target: 12 lines (+1/-1)
1 file modified
src/maasserver/forms_settings.py (+1/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/1.6-ntp-server-field-type-bug-1342135
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+226957@code.launchpad.net

This proposal supersedes a proposal from 2014-07-16.

Commit message

Backport trunk r2566: The NTP server config is no longer just an IP field; you can put domains in it too, so it's now a plain char field.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) wrote : Posted in a previous version of this proposal

Triv.

review: Approve
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maasserver/forms_settings.py'
2--- src/maasserver/forms_settings.py 2014-07-03 07:01:15 +0000
3+++ src/maasserver/forms_settings.py 2014-07-16 04:09:51 +0000
4@@ -167,7 +167,7 @@
5 },
6 'ntp_server': {
7 'default': None,
8- 'form': forms.GenericIPAddressField,
9+ 'form': forms.CharField,
10 'form_kwargs': {
11 'label': "Address of NTP server for nodes",
12 'required': False,

Subscribers

People subscribed via source and target branches

to all changes: