Merge lp://staging/~mpontillo/maas/ip-allocation-from-incorrect-range--bug-1677507--2.1 into lp://staging/maas/2.1
Proposed by
Mike Pontillo
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Mike Pontillo | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 5598 | ||||
| Proposed branch: | lp://staging/~mpontillo/maas/ip-allocation-from-incorrect-range--bug-1677507--2.1 | ||||
| Merge into: | lp://staging/maas/2.1 | ||||
| Diff against target: |
71 lines (+37/-2) 3 files modified
docs/changelog.rst (+9/-0) src/maasserver/models/subnet.py (+11/-2) src/maasserver/models/tests/test_subnet.py (+17/-0) |
||||
| To merge this branch: | bzr merge lp://staging/~mpontillo/maas/ip-allocation-from-incorrect-range--bug-1677507--2.1 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Mike Pontillo (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Don't allow allocation of least-recently-used discoveries if they occur in a reserved range.
* Merges revision 5887 from trunk to fix bug #1677507.
To post a comment you must log in.
Revision history for this message
| Mike Pontillo (mpontillo) wrote | # |
Revision history for this message
| MAAS Lander (maas-lander) wrote | # |
Download full text (169.0 KiB)
Revision history for this message
| MAAS Lander (maas-lander) wrote | # |
Download full text (14.0 KiB)
Revision history for this message
| MAAS Lander (maas-lander) wrote | # |
Download full text (13.1 KiB)
Revision history for this message
| MAAS Lander (maas-lander) wrote | # |
Download full text (14.1 KiB)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Rejecting temporarily to remove test case for feature that didn't exist in MAAS 2.1.