~mpontillo/maas/dns-template-changes-1.7
Viewing all changes in revision 2575.3.2.
-
Committer:
Jason Hobbs
-
Date:
2014-08-13 21:49:35 UTC
-
mfrom:
(2693 maas)
-
mto:
This revision was merged to the branch mainline in
revision
2699.
-
Revision ID:
jason.hobbs@canonical.com-20140813214935-36vvwf97wgczjui1
merge upstream
-
src/provisioningserver/drivers/diskless
-
src/provisioningserver/drivers/diskless/tests
-
src/provisioningserver/drivers/power
-
src/provisioningserver/drivers/power/tests
-
src/provisioningserver/drivers/tests
-
src/provisioningserver/logger
-
src/provisioningserver/logger/tests
-
src/provisioningserver/specs
- files renamed:
-
src/maasserver/templates/metadataserver/nodecommissionresult.html
=>
src/maasserver/templates/metadataserver/noderesult.html
-
src/maasserver/templates/metadataserver/nodecommissionresult_list.html
=>
src/maasserver/templates/metadataserver/noderesult_list.html
-
src/provisioningserver/testing/tags.py
=>
src/maasserver/testing/tags.py
expand all
collapse all
Show diffs side-by-side
added
removed