lp:~bjornt/maas/get-apt-proxy

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~maas-committers/maas/trunk at revision 6090

Mike Pontillo (community): Approve on 2017-06-15

Diff: 120 lines (+15/-20)

3 files modified

src/maasserver/compose_preseed.py (+9/-9)
src/maasserver/preseed.py (+2/-7)
src/maasserver/tests/test_compose_preseed.py (+4/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

6071. By Björn Tillenius on 2017-06-16

Fix test failures.

6070. By Björn Tillenius on 2017-06-16

Fix imports.

6069. By Björn Tillenius on 2017-06-15

Factor out getting the apt proxy.

6068. By Björn Tillenius on 2017-05-31

[r=blake-rouse][bug=][author=bjornt] Update HACKING.txt and add some helper script to allow machines to be
PXE booted of a development server (e.g. make run).

6067. By Данило Шеган on 2017-05-31

[r=blake-rouse][bug=][author=danilo] Port remaining maas-region commands to use argparse instead of optparse in order to support both Django 1.8 and 1.11 (optparse support dropped in 1.10).

6066. By Данило Шеган on 2017-05-31

[r=blake-rouse][bug=][author=danilo] Move MAAS config commands (local_config_get, local_config_set, local_config_reset) to use argparse instead of optparse: argparse style is supported in both Django 1.8 and 1.11.

6065. By Mike Pontillo on 2017-05-31

[r=blake-rouse][bug=][author=mpontillo] Make .idea directory creation consistent with .run directory.

Previously, there was a .idea directory checked into source control. However, the .idea directory is in the .bzrignore (and .gitignore) files. So it doesn't work quite right, because if you are actually using a code editor that supports IDEA project files (such as PyCharm), every time you open the project, those files will be updated, and the fact that .idea is ignored doesn't matter; those changes will still be present in your `bzr status`, and they're very easy to accidentally commit.

The solution is to make the .idea directory consistent with other skeleton runtime directories in MAAS (namely the ".run" directory).

This means developers wishing to use the IDEA project files will need to `make pycharm` (or `make .idea`) before launching an IDEA-based code editor.

6064. By Blake Rouse on 2017-05-30

[r=blake-rouse][bug=][author=blake-rouse] Update snapcraft to allow building in clean container. Update version string to show its trunk.

6063. By Данило Шеган on 2017-05-30

[r=mpontillo][bug=][author=danilo] Make VirtualBlockDevice.uuid editable and drop a workaround used to set it before because it was editable=False.

6062. By Björn Tillenius on 2017-05-29

[r=danilo][bug=][author=bjornt] Fix test_restore_network_interfaces_extra intermittent test failure.