lp://staging/~boyang-niu/maas/enable_custom_images

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/~maas-committers/maas/trunk

Andres Rodriguez (community): Disapprove on 2015-07-27

Jeroen T. Vermeulen (community): Approve on 2013-08-15

Julian Edwards: Pending requested 2013-07-09

Diff: 845 lines (+412/-45)

14 files modified

src/maasserver/forms.py (+89/-12)
src/maasserver/forms_settings.py (+13/-10)
src/maasserver/models/bootimage.py (+46/-5)
src/maasserver/models/config.py (+2/-3)
src/maasserver/models/node.py (+2/-4)
src/maasserver/templates/maasserver/boot_image_confirm_delete.html (+23/-0)
src/maasserver/templates/maasserver/bootimage.html (+26/-0)
src/maasserver/templates/maasserver/settings.html (+4/-0)
src/maasserver/templates/maasserver/settings_boot_images.html (+37/-0)
src/maasserver/tests/test_forms.py (+59/-0)
src/maasserver/urls.py (+8/-0)
src/maasserver/views/settings.py (+82/-0)
src/provisioningserver/pxe/config.py (+10/-5)
src/provisioningserver/pxe/tests/test_config.py (+11/-6)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1544. By Boyang Niu on 2013-07-16

changed the display name for images in form selection to be more detailed

1543. By Boyang Niu on 2013-07-16

style changes in order to make maas linter happy

1542. By Boyang Niu on 2013-07-09

added boot image creation/deletion forms, testing for custom images, and removed usage of distro_series enum

1541. By Boyang Niu on 2013-07-03

merged from trunk

1540. By Boyang Niu on 2013-07-03

Added boot image UI and file-writing support

1539. By Boyang Niu on 2013-07-01

merged conflicts with 1.3

1538. By Boyang Niu on 2013-07-01

replaced hardcoding of releases enum

1537. By Gavin Panella on 2013-06-26

[r=allenap][bug=][author=allenap] Document MAAS's development philosophy.

1536. By Jeroen T. Vermeulen on 2013-06-21

[r=rvb][bug=1084807][author=jtv] Warn users not to customize their MAAS-managed DHCP configuration by editing dhcpd.conf.

1535. By Raphaël Badin on 2013-06-21

[r=julian-edwards][bug=1054518][author=rvb] Remove duplicated distro_series field, set max_lenght to 20.