MAAS

Merge lp://qastaging/~lamont/maas/bug-1614584 into lp://qastaging/~maas-committers/maas/trunk

  1. bug-1614584
  2. Merge into trunk
Proposed by LaMont Jones
Status: Merged
Approved by: LaMont Jones
Approved revision: 5591
Merged at revision: 5593
Proposed branch: lp://qastaging/~lamont/maas/bug-1614584
Merge into: lp://qastaging/~maas-committers/maas/trunk
Diff against target: 73 lines (+25/-7)
3 files modified
src/maasserver/models/node.py (+13/-1)
src/maasserver/models/tests/test_node.py (+6/-1)
src/maasserver/models/tests/test_staticipaddress.py (+6/-5)
To merge this branch: bzr merge lp://qastaging/~lamont/maas/bug-1614584
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+312648@code.qastaging.launchpad.net

Commit message

Handle the case where gethostname() returns an FQDN.

Description of the change

Handle the case where gethostname() returns an FQDN.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve
lp://qastaging/~lamont/maas/bug-1614584 updated
5591. By LaMont Jones

Driveby: fix TestStaticIPAddressManagerMapping.test_get_hostname_ip_mapping_returns_fqdn_and_other.

5592. By LaMont Jones

Strip any domain from the remaining uses of gethostname().

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.