Merge ~andreserl/maas:lp1767137_2.3_xenial_default into maas:master
Proposed by
Andres Rodriguez
| Status: | Superseded |
|---|---|
| Proposed branch: | ~andreserl/maas:lp1767137_2.3_xenial_default |
| Merge into: | maas:master |
| Diff against target: |
2078 lines (+1669/-4) (has conflicts) 24 files modified
debian/changelog (+22/-0) snap/snapcraft.yaml (+9/-0) src/maasserver/bootsources.py (+3/-0) src/maasserver/models/tests/test_userprofile.py (+3/-0) src/maasserver/rpc/boot.py (+49/-0) src/maasserver/static/js/angular/controllers/nodes_list.js (+12/-0) src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js (+17/-0) src/maasserver/static/partials/ipranges.html (+17/-0) src/maasserver/static/partials/node-details.html (+134/-0) src/maasserver/static/partials/nodes-list.html (+1017/-0) src/maasserver/static/partials/script-results-list.html (+76/-0) src/maasserver/static/partials/subnet-details.html (+40/-0) src/maasserver/static/partials/vlan-details.html (+42/-0) src/maasserver/tests/test_bootsources.py (+3/-0) src/maasserver/tests/test_stats.py (+1/-1) src/maasserver/triggers/tests/test_websocket_listener.py (+5/-0) src/metadataserver/user_data/templates/commissioning.template (+4/-0) src/provisioningserver/drivers/osystem/ubuntu.py (+9/-1) src/provisioningserver/drivers/power/ipmi.py (+4/-0) src/provisioningserver/import_images/boot_resources.py (+61/-0) src/provisioningserver/import_images/tests/test_boot_resources.py (+92/-0) src/provisioningserver/import_images/tests/test_download_resources.py (+35/-0) src/provisioningserver/utils/tests/test_network.py (+3/-0) utilities/release-build (+11/-2) Conflict in debian/changelog Conflict in snap/snapcraft.yaml Conflict in src/maasserver/bootsources.py Conflict in src/maasserver/models/tests/test_userprofile.py Conflict in src/maasserver/rpc/boot.py Conflict in src/maasserver/static/js/angular/controllers/nodes_list.js Conflict in src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js Conflict in src/maasserver/static/partials/ipranges.html Conflict in src/maasserver/static/partials/node-details.html Conflict in src/maasserver/static/partials/nodes-list.html Conflict in src/maasserver/static/partials/script-results-list.html Conflict in src/maasserver/static/partials/subnet-details.html Conflict in src/maasserver/static/partials/vlan-details.html Conflict in src/maasserver/tests/test_bootsources.py Conflict in src/maasserver/triggers/tests/test_websocket_listener.py Conflict in src/provisioningserver/drivers/power/ipmi.py Conflict in src/provisioningserver/import_images/boot_resources.py Conflict in src/provisioningserver/import_images/tests/test_boot_resources.py Conflict in src/provisioningserver/import_images/tests/test_download_resources.py Conflict in src/provisioningserver/utils/tests/test_network.py Conflict in utilities/release-build |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| MAAS Maintainers | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
