~ltrager/maas:lp1830303

Branch merges

Propose for merging

Merged into maas:master

Blake Rouse (community): Approve on 2019-05-28

Diff: 289 lines (+66/-39)

11 files modified

src/maasserver/api/tests/test_vmfs_datastores.py (+8/-1)
src/maasserver/api/vmfs_datastores.py (+14/-0)
src/maasserver/models/filesystemgroup.py (+3/-0)
src/maasserver/models/tests/test_filesystemgroup.py (+9/-0)
src/maasserver/static/js/angular/controllers/node_details_storage.js (+2/-2)
src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js (+5/-9)
src/maasserver/static/partials/nodedetails/storage/datastores.html (+3/-3)
src/maasserver/static/partials/nodedetails/storage/disks-partitions.html (+3/-3)
src/maasserver/tests/test_preseed_storage.py (+18/-0)
src/maasserver/websockets/handlers/node.py (+1/-11)
src/maasserver/websockets/handlers/tests/test_machine.py (+0/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

5e0d730... by Lee Trager on 2019-05-28

Fix failing test

e8afefe... by Lee Trager on 2019-05-28

Fix missing used_for elements

df0894f... by Lee Trager on 2019-05-28

Fix adding to datastores

bfd9c99... by Lee Trager on 2019-05-28

Merge branch 'master' into lp1830303

7bcf907... by Alberto Donato on 2019-05-28

add a service_type label to cpu/mem metrics

fe6c7f5... by Björn Tillenius on 2019-05-28

Fix spuriuos test__copy test failures.

Make sure the filesystem, virtual block devices and partitions
get recreated in the same order as in the source machine.

I had two different kind of spurious failures locally, and both seems to
be fixed with this patch.

8fcad8b... by Steve Rydz on 2019-05-28

LP: #1830267 - Fix odd line break in log output

4e4a1e9... by Alberto Donato on 2019-05-27

LP: #1828579 - use the UUID instead of maas_id for Prometheus labels

295bed4... by Alberto Donato on 2019-05-24

split available/used IP usage stats for dynamic and reserved types

0f80078... by Steve Rydz on 2019-05-24

Add combined disk size to esxi datastores