lp:~lamont/maas/domain-detail

Branch merges

Propose for merging

No branches dependent on this one.

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

Mike Pontillo (community): Approve on 2016-02-16

Blake Rouse (community): Needs Fixing on 2016-02-16

Diff: 1965 lines (+914/-228)

31 files modified

services/rackd/run (+1/-1)
src/maasserver/api/dnsresourcerecords.py (+4/-0)
src/maasserver/api/ip_addresses.py (+9/-4)
src/maasserver/api/tests/test_dnsresourcerecords.py (+24/-0)
src/maasserver/api/tests/test_ipaddresses.py (+59/-0)
src/maasserver/dns/config.py (+13/-2)
src/maasserver/dns/tests/test_config.py (+64/-4)
src/maasserver/dns/tests/test_zonegenerator.py (+30/-22)
src/maasserver/dns/zonegenerator.py (+17/-11)
src/maasserver/models/dnsdata.py (+18/-8)
src/maasserver/models/domain.py (+33/-35)
src/maasserver/models/staticipaddress.py (+28/-12)
src/maasserver/models/tests/test_dnsdata.py (+23/-2)
src/maasserver/models/tests/test_domain.py (+31/-52)
src/maasserver/models/tests/test_node.py (+2/-1)
src/maasserver/models/tests/test_staticipaddress.py (+118/-28)
src/maasserver/static/js/angular/controllers/domain_details.js (+61/-0)
src/maasserver/static/js/angular/controllers/domains_list.js (+1/-1)
src/maasserver/static/js/angular/controllers/tests/test_domain_details.js (+158/-0)
src/maasserver/static/js/angular/controllers/tests/test_domains_list.js (+95/-0)
src/maasserver/static/js/angular/controllers/tests/test_networks_list.js (+2/-2)
src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js (+2/-2)
src/maasserver/static/js/angular/maas.js (+8/-0)
src/maasserver/static/partials/domain-details.html (+56/-0)
src/maasserver/static/partials/domains-list.html (+10/-12)
src/maasserver/static/partials/subnet-details.html (+7/-2)
src/maasserver/testing/factory.py (+9/-3)
src/maasserver/views/combo.py (+1/-0)
src/maasserver/websockets/handlers/domain.py (+4/-4)
src/maasserver/websockets/handlers/tests/test_domain.py (+22/-18)
src/provisioningserver/dns/tests/test_zoneconfig.py (+4/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

4668. By LaMont Jones on 2016-02-18

Use a bigger random space for the test, so that we collide and fail less often.

4667. By LaMont Jones on 2016-02-18

fix broken merge

4666. By LaMont Jones on 2016-02-18

fix intermittent test failure.

4665. By LaMont Jones on 2016-02-18

Unit test fixes.

4664. By LaMont Jones on 2016-02-18

Fix bad merge

4663. By LaMont Jones on 2016-02-17

merge from trunk

4662. By LaMont Jones on 2016-02-17

Finish the conversion from loadManagers to loadManager in the DNS controllers.

4661. By LaMont Jones on 2016-02-17

Various test fixes.

4660. By LaMont Jones on 2016-02-17

merge from trunk.

4659. By LaMont Jones on 2016-02-16

More unit tests. More javascript cleanup based on review comments.