lp://staging/~brendan-donegan/maas/2.1_django_module

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

472. By Brendan Donegan on 2016-12-19

Merge from trunk

471. By Brendan Donegan on 2016-12-09

move import

470. By Brendan Donegan on 2016-12-09

import sys

469. By Brendan Donegan on 2016-12-09

maasserver.djangosettings.settings is only used in 2.2 and later

468. By Brendan Donegan on 2016-12-07

[r=mpontillo][bug=][author=brendan-donegan] Re-add machines that seem to be working

467. By Gavin Panella on 2016-12-06

[r=brendan-donegan][bug=1646748][author=allenap] Update DJANGO_SETTINGS_MODULE.

466. By Brendan Donegan on 2016-12-02

[r=allenap][bug=][author=brendan-donegan] Timeout if machines not deployed after 30 minutes

465. By Brendan Donegan on 2016-12-01

[r=allenap][bug=][author=brendan-donegan] Update create device test to assume the subnet will be linked even if the devices interface has no vlan associated

464. By Brendan Donegan on 2016-11-29

[r=andreserl][bug=][author=brendan-donegan] Add a test which deploys the ubuntu charm to a container on the juju controller. Then check that we can ssh to the container using its public ip address

463. By Brendan Donegan on 2016-11-24

[r=brendan-donegan][bug=][author=brendan-donegan] Expand BMC IP range to include new BMCs (Gigabyte and IBM servers)