lp:~quentin-conner/maas/CaringoOS

Branch merges

Propose for merging

1 branch proposed for merging into this one.

No branches dependent on this one.

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

Andres Rodriguez (community): Abstain on 2016-07-12

Blake Rouse (community): Needs Information on 2016-07-07

Diff: 701 lines (+268/-23) (has conflicts)

21 files modified

Makefile (+1/-1)
src/maasserver/api/machines.py (+44/-13)
src/maasserver/bootresources.py (+7/-0)
src/maasserver/forms.py (+13/-1)
src/maasserver/forms_iprange.py (+3/-0)
src/maasserver/migrations/builtin/maasserver/0069_add_boot_type.py (+19/-0)
src/maasserver/models/bootresource.py (+22/-0)
src/maasserver/models/node.py (+3/-0)
src/maasserver/node_action.py (+11/-0)
src/maasserver/rpc/boot.py (+14/-1)
src/maasserver/utils/osystems.py (+26/-0)
src/provisioningserver/boot/__init__.py (+4/-4)
src/provisioningserver/boot/pxe.py (+7/-2)
src/provisioningserver/drivers/osystem/__init__.py (+9/-0)
src/provisioningserver/drivers/osystem/caringo.py (+65/-0)
src/provisioningserver/kernel_opts.py (+2/-0)
src/provisioningserver/rackdservices/tftp.py (+8/-1)
src/provisioningserver/rpc/cluster.py (+1/-0)
src/provisioningserver/rpc/osystems.py (+1/-0)
src/provisioningserver/rpc/region.py (+2/-0)
src/provisioningserver/templates/pxe/config.xinstall.amd64.generic.ephemeral.template (+6/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4963. By Quentin Conner on 2016-09-12

do not update packaging trunk after initial checkout. Manual op now on this branch.

4962. By Quentin Conner on 2016-09-12

fix the packaging.trunk repo at rev 514 to match the 2.0.0 GA release of maas

4961. By Quentin Conner on 2016-09-01

Justin Kovaric patch to fix REST call for making IP range reservations

4960. By Quentin Conner on 2016-09-01

merge 2.0.0 from upstream trunk (rev 5189)

4959. By Quentin Conner on 2016-08-11

merge upstream 2.0.0-rc4 (bzr 5187) to CaringoOS branch

4958. By Quentin Conner on 2016-07-28

merge upstream 2.0.0-rc3 (bzr 5180) to CaringoOS
move add_boot_type from 66 to 69 in ORM migration sequence

4957. By Quentin Conner on 2016-07-02

require osystem on Machine REST API calls

4956. By Quentin Conner on 2016-07-01

form bugfix

4955. By Quentin Conner on 2016-07-01

added boottype to Machine form

4954. By Quentin Conner on 2016-06-29

REST API support for ephemeral boot