~ltrager/maas:s390x-dpm-boot

Branch merges

Propose for merging

Rejected for merging into maas:master

MAAS Lander: Needs Fixing on 2019-08-11

Alberto Donato (community): Approve on 2019-03-27

Dimitri John Ledkov: Pending requested 2018-12-21

Diff: 924 lines (+229/-188)

23 files modified

dev/null (+0/-23)
src/maasserver/api/machines.py (+0/-3)
src/maasserver/api/rackcontrollers.py (+0/-3)
src/maasserver/api/regioncontrollers.py (+0/-3)
src/maasserver/api/tests/test_enlistment.py (+0/-6)
src/maasserver/api/tests/test_rackcontroller.py (+0/-3)
src/maasserver/api/tests/test_regioncontroller.py (+0/-3)
src/maasserver/rpc/boot.py (+0/-4)
src/maasserver/rpc/tests/test_boot.py (+0/-65)
src/maasserver/testing/factory.py (+0/-8)
src/provisioningserver/boot/__init__.py (+38/-0)
src/provisioningserver/boot/powernv.py (+3/-12)
src/provisioningserver/boot/pxe.py (+4/-18)
src/provisioningserver/boot/s390x.py (+2/-11)
src/provisioningserver/boot/s390x_dpm.py (+78/-0)
src/provisioningserver/boot/tests/test_boot.py (+19/-1)
src/provisioningserver/boot/tests/test_powernv.py (+3/-16)
src/provisioningserver/boot/tests/test_s390x_dpm.py (+54/-0)
src/provisioningserver/dhcp/config.py (+13/-5)
src/provisioningserver/dhcp/tests/test_config.py (+5/-2)
src/provisioningserver/rackdservices/tests/test_tftp.py (+7/-1)
src/provisioningserver/rackdservices/tftp.py (+2/-0)
utilities/check-imports (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

9a3e330... by Lee Trager on 2019-04-30

Merge branch 'master' into s390x-dpm-boot

1c9b1e7... by Steve Rydz on 2019-04-30

LP: #1826280 - Add nav highlight to settings

8bbd38b... by Kit Randel on 2019-04-29

Update group by status order in machine list and group by status_code rather than status.

f570966... by Blake Rouse on 2019-04-29

Fixes LP: #1826864 - Fix ipxe.cfg to fallback to amd64 enlistment.

3034f29... by Steve Rydz on 2019-04-29

LP: #1822647 - Add spaces to machines table

a341b02... by Andres Rodriguez on 2019-04-29

debian/changelog: Release 2.6.00-beta2; Open 2.6.0-beta3

2f8a7d3... by Kit Randel on 2019-04-29

Add prettier and format js and scss codebase.

691e14e... by Andres Rodriguez on 2019-04-27

LP: #1826600 - Correctly capture and pass the force param when releasing a machine

2db6be0... by Caleb Ellis on 2019-04-26

LP: #1826272 - Allow undercommitting of resources in a pod to min 0.1

751828f... by Björn Tillenius on 2019-04-26

Improve the check for checking whether a database is dirty.

The previous code tried to check, but it's was using an unreliable way,
and it ended up always marking the database as dirty.

Now we assume that the database is dirty, but allow tests to mark it as
clean, if it knows that the transaction was not committed.

MAASServerTestCase was changed to mark the database as clean, resulting
in the databases getting reused often and cuts the test suite run time
in half.