~ltrager/maas:lp1840181_2.6

Branch merges

Propose for merging

Merged into maas:2.6

Lee Trager (community): Approve on 2019-08-19

MAAS Lander: Pending (unittests) requested 2019-08-19

Diff: 299 lines (+65/-45)

7 files modified

src/maasserver/api/tests/test_machines.py (+4/-0)
src/maasserver/api/tests/test_tag.py (+13/-2)
src/maasserver/models/signals/scriptresult.py (+17/-15)
src/maasserver/models/signals/tests/test_scriptresult.py (+16/-23)
src/maasserver/models/tests/test_blockdevice.py (+3/-2)
src/maasserver/testing/factory.py (+10/-1)
src/maasserver/websockets/handlers/tests/test_machine.py (+2/-2)

api

Superseded for merging into maas:master

MAAS Maintainers: Pending requested 2019-08-19

Diff: 3421 lines (+1314/-676) (has conflicts)

36 files modified

.eslintrc.js (+3/-0)
Makefile (+7/-0)
debian/changelog (+11/-1)
debian/copyright (+0/-4)
dev/null (+0/-631)
jest.config.js (+6/-0)
package.json (+16/-0)
src/maasserver/models/signals/scriptresult.py (+6/-0)
src/maasserver/models/signals/tests/test_scriptresult.py (+13/-0)
src/maasserver/static/js/angular/controllers/pods_list.js (+5/-0)
src/maasserver/static/js/angular/controllers/settings.js (+114/-0)
src/maasserver/static/js/angular/controllers/tests/test_pods_list.js (+5/-0)
src/maasserver/static/js/angular/controllers/tests/test_settings.js (+264/-0)
src/maasserver/static/js/angular/controllers/tests/test_zones_list.js (+4/-0)
src/maasserver/static/js/angular/directives/machines_table.js (+31/-9)
src/maasserver/static/js/angular/directives/script_status.js (+3/-0)
src/maasserver/static/js/angular/directives/tests/test_machines_table.js (+30/-0)
src/maasserver/static/js/angular/entry.js (+1/-7)
src/maasserver/static/js/bundle/maas-min.js (+4/-0)
src/maasserver/static/js/bundle/maas-min.js.map (+5/-1)
src/maasserver/static/js/bundle/vendor-min.js (+4/-0)
src/maasserver/static/js/bundle/vendor-min.js.map (+5/-1)
src/maasserver/static/partials/dashboard.html (+1/-1)
src/maasserver/static/partials/machines-table.html (+24/-2)
src/maasserver/static/partials/networks-list.html (+2/-2)
src/maasserver/static/partials/node-events.html (+1/-1)
src/maasserver/static/partials/nodes-list.html (+66/-2)
src/maasserver/static/partials/pods-list.html (+5/-0)
src/maasserver/static/partials/subnet-details.html (+1/-1)
src/maasserver/static/partials/switches-table.html (+1/-1)
src/maasserver/static/partials/zones-list.html (+6/-0)
src/maasserver/testing/html-loader.js (+0/-0)
src/metadataserver/user_data/templates/snippets/maas_run_remote_scripts.py (+8/-0)
src/metadataserver/user_data/templates/snippets/tests/test_maas_run_remote_scripts.py (+20/-0)
src/provisioningserver/utils/version.py (+4/-0)
yarn.lock (+638/-12)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

6049734... by Lee Trager on 2019-08-19

Fix merge conflict

c74b6fb... by Lee Trager on 2019-08-19

Backport of df8ae4e LP: #1840181 - Use model to get device name for ScriptResult events

f73b1cc... by Newell Jensen on 2019-08-16

backport of f0331a265c1096ad7ee5cb1a24223b3c6b5813ff

LP: #1834500, #1468830 -- Mark previously deployed machines deployed when mark fixed. Allow marking a machine fixed if power is not on.

d56cfcf... by Blake Rouse on 2019-08-13

Fixes LP: #1710278 - Notice when bind9 is hung, force kill the service, ensure it starts again, then perform a reload.

Backport of d0a4ec6ce2af49d00431c0d7ad4c5164d3951e1a.

80c4959... by Lee Trager on 2019-08-08

LP: #1836293 - Install Debian packages with --no-install-recommends

Backport of edb6603

74f6896... by Adam Collard on 2019-07-26

Bump DEFAULT_VERSION to 2.6.1

a4c12e3... by Blake Rouse on 2019-07-26

Fix get_mac_addresses to ignore zero based mac addresses. Fix get_all_interfaces_definition to ignore zero based mac addresses.

Backport of 34631c2fe5062ac9078c8175d3fabf7eef394d8a

52f2b53... by Blake Rouse on 2019-07-26

Do not convert IPv4 addresses to IPv6 cast addresses.

Backport of 573da6972903c1b5566aad3012b97b09108d46eb

dbbc280... by Newell Jensen on 2019-07-24

Backport of d0a34d08f4b0fe245423939229daa3b71e0843a7

LP: #1806969 -- Explicitly search for bridges, bonds, followed by the remaining interfaces when retrieving a requested machine via interface constraints.

fc8c42d... by Lee Trager on 2019-07-20

Backport of 302d171 LP: #1835275 - Remove netplan interface lock.

Netplan creates a configuration file which locks the interface used to boot.
This ensures netbooted environments don't get disconnected. MAAS may send
a netplan configuration file which will reconfigure the boot interface. The
script runner will ensure the machine reconnects.