← Back to branch summary

~mpontillo/maas/fix-bridges-on-vlans-1555679

~mpontillo/maas/fix-bridges-on-vlans-1555679

Viewing all changes in revision 4824.5.17.

Committer: LaMont Jones
Date: 2016-03-31 23:34:55 UTC
mfrom: (4824.6.4 create-maas-proxy.conf)
mto: (4848.1.14 maas)
mto: This revision was merged to the branch mainline in revision 4853.
Revision ID: lamont@canonical.com-20160331233455-t1ijphtba5bz1nzc

Merge Blake's fixes

files removed:
src/maasserver/models/signals/proxy.py

files modified:
src/maasserver/proxyconfig.py

src/maasserver/region_controller.py

src/maasserver/start_up.py

src/maasserver/tests/test_proxyconfig.py

src/maasserver/tests/test_region_controller.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system.py

src/maasserver/triggers/tests/test_system_listener.py

Show diffs side-by-side

added added

removed removed

src/maasserver/models/signals/proxy.py

src/maasserver/proxyconfig.py

src/maasserver/region_controller.py

src/maasserver/start_up.py

src/maasserver/tests/test_proxyconfig.py

src/maasserver/tests/test_region_controller.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system.py

src/maasserver/triggers/tests/test_system_listener.py

Older »