Merge lp:~rvb/maas/backport-fixes into lp:maas/1.2
Proposed by
Raphaël Badin
Status: | Merged |
---|---|
Approved by: | Raphaël Badin |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1375 |
Proposed branch: | lp:~rvb/maas/backport-fixes |
Merge into: | lp:maas/1.2 |
Diff against target: |
307 lines (+116/-29) 6 files modified
src/maasserver/api.py (+29/-3) src/maasserver/models/node.py (+2/-0) src/maasserver/testing/factory.py (+19/-0) src/maasserver/tests/test_api.py (+46/-0) src/maasserver/tests/test_forms.py (+7/-26) src/maasserver/tests/test_node.py (+13/-0) |
To merge this branch: | bzr merge lp:~rvb/maas/backport-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raphaël Badin (community) | Approve | ||
Review via email: mp+160809@code.launchpad.net |
Commit message
Backport revisions 1468 and 1469.
To post a comment you must log in.
Simple backport, self-approving.