~blake-rouse/maas:fix-snap-version-git

Branch merges

Propose for merging

Merged into maas:master

Blake Rouse (community): Approve on 2017-06-22

Diff: 154 lines (+56/-42)

5 files modified

.gitignore (+4/-0)
dev/null (+0/-34)
snap/snapcraft.yaml (+2/-7)
src/maasserver/__init__.py (+1/-1)
utilities/calc-snap-version (+49/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

6d7d7fe... by Blake Rouse on 2017-06-22

Put the total number of revisions in the snap version.

711fc55... by Blake Rouse on 2017-06-22

Compute the snap version using version-script. Remove the bzr_version plugin.

b04408b... by Blake Rouse on 2017-06-22

Fix the dependencies so build on a fresh ubuntu 16.04 works correctly. Remove the need for etc/templates since that folder is empty in git and git won't check it in. Add missing dependencies lshw and python3-petname.

b0d35b7... by Lee Trager on 2017-06-22

[r=blake-rouse,mpontillo][bug=][author=ltrager] When booting the ephemeral environment, fetch the rootfs over HTTP instead of using iSCSI.

56a9658... by =?utf-8?q?Danilo_=C5=A0egan?= <email address hidden> on 2017-06-22

[r=blake-rouse][bug=][author=danilo] Move osystem/distro_series combining logic to API handlers instead of LicenseKeyForm.full_clean() which now always requires such a form for distro_series field.

34e1211... by Andres Rodriguez on 2017-06-21

Update docs

8fcec4f... by Stefan Krupop on 2017-06-21

[r=newell-jensen][bug=][author=stefankrupop] adds power management support for christmann RECS|Box servers (https://embedded.christmann.info/).

153a1d1... by Andres Rodriguez on 2017-06-21

[r=andreserl][bug=][author=andreserl] docs/releases.rst: Update to reflect latest releases.

67b43e8... by =?utf-8?q?Danilo_=C5=A0egan?= <email address hidden> on 2017-06-21

[r=blake-rouse][bug=][author=danilo] Replace all in-place modifying of POST data which is immutable in more recent Django versions.

34898ce... by =?utf-8?q?Danilo_=C5=A0egan?= <email address hidden> on 2017-06-21

[r=mpontillo][bug=1699479][author=danilo] Make TestDHCPNetworkLayout.test__dhcp_configurations_rendered always run in both IPv4 and IPv6 network configurations to ensure it stably either passes or fails.

To avoid resolve_hostname() on the MAAS configured URL only return an IP address that it resolves to on the local system (which could be only IPv4 or only IPv6 address) which can't be used for a DNS server, we patch resolve_hostname() in the test to return the appropriate localhost address.