~ltrager/maas:lp1650396

Branch merges

Propose for merging

Merged into maas:master

Andres Rodriguez (community): Needs Information on 2017-06-28

Данило Шеган (community): Approve on 2017-06-28

Diff: 441 lines (+61/-79)

5 files modified

src/maasserver/api/interfaces.py (+6/-14)
src/maasserver/api/tests/test_interfaces.py (+29/-16)
src/maasserver/static/js/angular/controllers/node_details_networking.js (+7/-30)
src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js (+8/-8)
src/maasserver/static/partials/node-details.html (+11/-11)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

fa3a300... by Lee Trager on 2017-06-28

Merge branch 'lp1650396' of git+ssh://git.launchpad.net/~ltrager/maas into lp1650396

2cece51... by Lee Trager on 2017-06-28

Danillo fixes

d5b995b... by Lee Trager on 2017-06-27

danilo fixes

f8940aa... by Lee Trager on 2017-06-27

Allow editing of network settings while a machine is in an allocated state.

This fixes LP:1650396

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

Update our monkey-patched version of get_resource_uri_template() to use get_callable() without a can_fail=True argument.

673c950... by =?utf-8?q?Danilo_=C5=A0egan?= <email address hidden> on 2017-06-28

Use __in for Django QuerySet filtering, introduce UnstrippedCharField to match up with the existing StrippedCharField and use it for SSHKey and SSLKey forms (forms.CharField has changed incompatibly in 1.9 to strip whitespace by default), and do not attempt to call isdigit() string method on StaticIPAddress objects.

b378bdd... by Mike Pontillo on 2017-06-28

Refactor plugin.py to allow the reactor to be passed in.

Since the beaconing code will start a UDP/Multicast listener, this
change was necessary in order to ensure the reactor is left in a
clean state after these tests run.

f692d5f... by Andres Rodriguez <email address hidden> on 2017-06-27

LP: #1669744, #1680795 : Always show toggle and make sure tooltip is in between label and toggle.

0e05b6c... by Lee Trager on 2017-06-27

danilo fixes

bcf2525... by Lee Trager on 2017-06-27

Squashed commit of the following:

commit a4f9627af7727bb96f4aad276c7f4a8d88b06d6a
Author: Lee Trager <email address hidden>
Date: Tue Jun 27 19:31:06 2017 +0000

    Remove link-junk from Makefile

    make lint ran link-junk which checks for bzr files accidentally committed.
    MAAS is no longer in bzr so this check is no longer needed and keeping it
    causes bzr to complain its not being run from a bzr branch.