Merge lp:~andreserl/maas/maas_lp1553791 into lp:~maas-committers/maas/trunk
Proposed by
Andres Rodriguez
Status: | Merged |
---|---|
Approved by: | Andres Rodriguez |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4737 |
Proposed branch: | lp:~andreserl/maas/maas_lp1553791 |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
232 lines (+24/-24) 11 files modified
HACKING.txt (+3/-3) INSTALL.txt (+1/-1) Makefile (+3/-3) buildout.cfg (+2/-2) docs/development/cluster-registration.rst (+1/-1) etc/maas/templates/dhcp/dhcpd.conf.template (+3/-3) services/rackd/run (+2/-2) src/provisioningserver/dhcp/tests/test_notifier.py (+2/-2) src/provisioningserver/utils/fs.py (+4/-4) src/provisioningserver/utils/tests/test_fs.py (+2/-2) src/provisioningserver/utils/tests/test_script.py (+1/-1) |
To merge this branch: | bzr merge lp:~andreserl/maas/maas_lp1553791 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+288300@code.launchpad.net |
Commit message
Change maas-provision to maas-rack
To post a comment you must log in.
https:/ /code.launchpad .net/~andreserl /maas/lp1553791 /+merge/ 288296