Merge lp://qastaging/~rbanffy/maas/bug-1440090-info-lost-rediscovery into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Ricardo Bánffy
| Status: | Merged |
|---|---|
| Approved by: | Andres Rodriguez |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 3780 |
| Proposed branch: | lp://qastaging/~rbanffy/maas/bug-1440090-info-lost-rediscovery |
| Merge into: | lp://qastaging/~maas-committers/maas/trunk |
| Diff against target: |
12 lines (+1/-1) 1 file modified
src/metadataserver/models/commissioningscript.py (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~rbanffy/maas/bug-1440090-info-lost-rediscovery |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andres Rodriguez (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Fix MACAddress recreation issue caused by incorrect MAC x MACAddress comparisons.
Description of the change
Fix MAC x MACAddress comparisons, reorder addition and removal to make errors more easily detectable, add tests and make NIC redetection happen before DHCP reconfiguration.
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
I'm gonna approve, but there's just one minor fix you need to address. See inline.