~mpontillo/maas:subnet-details-show-containers--bug-1761269

Branch merges

Merged into maas:master

Andres Rodriguez (community): Approve on 2018-04-27

Newell Jensen: Approve on 2018-04-25

MAAS Lander: Approve on 2018-04-25

Diff: 48 lines (+14/-0)

3 files modified

src/maasserver/models/staticipaddress.py (+1/-0)
src/maasserver/static/js/angular/controllers/subnet_details.js (+4/-0)
src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js (+9/-0)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

ca0beb2... by Mike Pontillo on 2018-04-25

LP: #1761269 - Show containers as containers instead of devices on subnet details page

7dee2a0... by Lee Trager on 2018-04-25

Signal skipped when block devices commissioning script is run in a container.

The block devices commissioning script runs on both controllers and machines.
It can not be run in a container or in a snap. When this is detected the script exists early returning no information. 720fa5c allows scripts to
return skipped when unable to run, this case was missed.

As this case can only happen on controllers support has been added for
controllers to signal results back.

0582b0b... by Karl Williams on 2018-04-25

Correctly format Reserved Ranges edit form

2a01e0c... by Lee Trager on 2018-04-25

LP: #1766680 - Fix HTML formatting and add missing end tags

b955039... by Lee Trager on 2018-04-25

LP: #1761600 - Don't return deferLater value.

In b352322 MAAS was modified to use asyncio or uvloop as the backend for
twisted. The value of deferLater was returned in maybe_change_power_state
which fixes a number of unit tests. Doing this causes the defer to be
resolved with the caller instead of running later. This meant when a user
issues a power action, such as deploy or release, the websocket and
subsequent RPC call didn't resolve until the power action is completed.

This removes the return so the power action can happen later greatly
speeding up power actions. The unit tests are fixed by patching
deferLater in the tests to use maybeDeferred.

a69f7a7... by Alberto Donato on 2018-04-25

don't allow editing non-local groups

397148d... by Lee Trager on 2018-04-24

LP: #1761279 - Don't show hardware status tooltip when icon isn't shown.

b84a579... by Andres Rodriguez on 2018-04-24

LP: #1761813 - Better handle errors coming from simplestreams

3320122... by Mike Pontillo on 2018-04-24

LP: #1727392 - Make domain details page header consistent.

a71e2a5... by Karl Williams on 2018-04-24

Align number fields on DNS page to the right-hand side and reorder the columns