~ltrager/maas:lp1701694_2.2

Branch merges

Propose for merging

Merged into maas:2.2 at revision c262efce2849c532e1373662b12354f5d5e0eea5

Blake Rouse (community): Approve on 2017-07-21

Diff: 727 lines (+186/-138)

22 files modified

src/maasserver/bootresources.py (+3/-3)
src/maasserver/forms/__init__.py (+11/-13)
src/maasserver/forms/tests/test_bootresource.py (+45/-2)
src/maasserver/models/bootresource.py (+12/-3)
src/maasserver/models/tests/test_bootresource.py (+21/-0)
src/maasserver/tests/test_bootresources.py (+3/-3)
src/maasserver/utils/osystems.py (+4/-5)
src/maasserver/utils/tests/test_osystems.py (+25/-0)
src/provisioningserver/drivers/osystem/__init__.py (+6/-5)
src/provisioningserver/drivers/osystem/bootloader.py (+0/-4)
src/provisioningserver/drivers/osystem/centos.py (+28/-24)
src/provisioningserver/drivers/osystem/custom.py (+0/-5)
src/provisioningserver/drivers/osystem/tests/test_base.py (+10/-1)
src/provisioningserver/drivers/osystem/tests/test_bootloader.py (+0/-5)
src/provisioningserver/drivers/osystem/tests/test_centos.py (+5/-19)
src/provisioningserver/drivers/osystem/tests/test_custom.py (+0/-9)
src/provisioningserver/drivers/osystem/tests/test_ubuntu.py (+11/-6)
src/provisioningserver/drivers/osystem/tests/test_ubuntucore.py (+0/-9)
src/provisioningserver/drivers/osystem/ubuntu.py (+1/-9)
src/provisioningserver/drivers/osystem/ubuntucore.py (+0/-5)
src/provisioningserver/drivers/osystem/windows.py (+1/-5)
src/provisioningserver/testing/os.py (+0/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

c262efc... by Lee Trager on 2017-07-19

Allow uploading images with the format osystem/release.

All images uploaded are now of rtype UPLOADED. Users can upload using the format osystem/release where osystem is a supported OS.

Fixes: LP: #1701694, #1361370

78d97d0... by Mike Pontillo on 2017-07-19

Prevent RegionService from using empty lists.

LP: #1705254
Backports: 3dd8eedfba921760f98ea54805d05c86e63266ec

b2a64fb... by Andres Rodriguez on 2017-07-18

Update CHANGELOG

9031a90... by Blake Rouse on 2017-07-18

Backport f0fa3535e30bf3d3a6a1c437e8f8199ac0bbfeb5: Return only one connection per rack controller from getAllClients. Fixes lp: #1704489.

13fbc91... by Newell Jensen on 2017-07-15

Update changelog.

5bb0e14... by Newell Jensen on 2017-07-14

Backport from master -- LP: #1700802 -- Add missing networking constraint names.

0ec051d... by Newell Jensen on 2017-07-14

Backport from master -- LP: #1702690 Set the machine's min_hwe_kernel to the setting's default_min_hwe_kernel when commissioning.

d97cd63... by Andres Rodriguez on 2017-07-14

Backport 8a42cf86222aace7a4462137a7d941e9535604ef from master

LP: #1609496 - Increase & add 'wait_time' for IPMI to allow it working for older & broken BMC's

bdb33c3... by Andres Rodriguez on 2017-07-13

LP: #1703713 - Fix missing link on domain details page

8d31e11... by Andres Rodriguez on 2017-07-13

Backport fc3bfd69e7c882a5dc60e8f19481217473d89528 from master.

LP: #1701056: Show correct information for a device details page as a normal user
LP: #1701052: Do not show the controllers tab as a normal user
Fix format when devices/controllers are selected to match those of machines