← Back to branch summary

~allenap/maas/database-locks-rerevisited

~allenap/maas/database-locks-rerevisited

Viewing all changes in revision 4151.

Committer: Gavin Panella
Date: 2015-08-14 13:23:28 UTC
mfrom: (4141.1.50 maas)
Revision ID: gavin.panella@canonical.com-20150814132328-w18wgqk3jppvfcx3

Merged trunk into database-locks-rerevisited.

files added:
src/maasserver/api/bcache_cacheset.py

src/maasserver/api/fabrics.py

src/maasserver/api/tests/test_bcache_cacheset.py

src/maasserver/api/tests/test_fabrics.py

src/maasserver/api/tests/test_vlans.py

src/maasserver/api/vlans.py

src/maasserver/migrations/0160_add_cache_set_model.py

src/maasserver/models/cacheset.py

src/maasserver/models/tests/test_cacheset.py

src/maasserver/tests/test_forms_cacheset.py

src/provisioningserver/drivers/power/ipmi.py

src/provisioningserver/drivers/power/tests/test_ipmi.py

files removed:
etc/maas/templates/power/ipmi.conf

etc/maas/templates/power/ipmi.template

files modified:
HACKING.txt

docs/hardware-enablement-kernels.rst

etc/maas/templates/dhcp/dhcpd.conf.template

etc/maas/templates/dhcp/dhcpd6.conf.template

setup.py

src/maas/__init__.py

src/maas/tests/test_maas.py

src/maasserver/api/bcache.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/nodes.py

src/maasserver/api/tests/test_bcache.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_raid.py

src/maasserver/api/tests/test_volume_groups.py

src/maasserver/enum.py

src/maasserver/forms.py

src/maasserver/models/__init__.py

src/maasserver/models/blockdevice.py

src/maasserver/models/bootresource.py

src/maasserver/models/bootresourceset.py

src/maasserver/models/fabric.py

src/maasserver/models/filesystem.py

src/maasserver/models/filesystemgroup.py

src/maasserver/models/interface.py

src/maasserver/models/macaddress.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/tests/test_bootresource.py

src/maasserver/models/tests/test_fabric.py

src/maasserver/models/tests/test_filesystemgroup.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_macaddress.py

src/maasserver/models/tests/test_node.py

src/maasserver/node_action.py

src/maasserver/preseed_storage.py

src/maasserver/static/js/angular/controllers/add_hardware.js

src/maasserver/static/js/angular/controllers/node_details.js

src/maasserver/static/js/angular/controllers/nodes_list.js

src/maasserver/static/js/angular/controllers/tests/test_add_hardware.js

src/maasserver/static/js/angular/controllers/tests/test_node_details.js

src/maasserver/static/js/angular/directives/os_select.js

src/maasserver/static/js/angular/factories/general.js

src/maasserver/static/js/angular/factories/tests/test_general.js

src/maasserver/static/js/angular/services/validation.js

src/maasserver/static/partials/node-details.html

src/maasserver/static/partials/node-events.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/storage_layouts.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_auth.py

src/maasserver/tests/test_forms_bcache.py

src/maasserver/tests/test_forms_helpers.py

src/maasserver/tests/test_forms_node.py

src/maasserver/tests/test_forms_raid.py

src/maasserver/tests/test_forms_volume_group.py

src/maasserver/tests/test_preseed_storage.py

src/maasserver/tests/test_storage_layouts.py

src/maasserver/urls_api.py

src/maasserver/utils/async.py

src/maasserver/utils/orm.py

src/maasserver/utils/osystems.py

src/maasserver/utils/tests/test_async.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/utils/tests/test_osystems.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/views.py

src/maasserver/websockets/handlers/general.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/tests/test_general.py

src/metadataserver/models/tests/test_commissioningscript.py

src/provisioningserver/dhcp/__init__.py

src/provisioningserver/drivers/power/__init__.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/power/tests/test_poweraction.py

src/provisioningserver/tests/test_kernel_opts.py

Show diffs side-by-side

added added

removed removed

docs/hardware-enablement-kernels.rst

etc/maas/templates/dhcp/dhcpd.conf.template

etc/maas/templates/dhcp/dhcpd6.conf.template

etc/maas/templates/power/ipmi.conf

etc/maas/templates/power/ipmi.template

src/maas/__init__.py

src/maas/tests/test_maas.py

src/maasserver/api/bcache.py

src/maasserver/api/bcache_cacheset.py

src/maasserver/api/fabrics.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/nodes.py

src/maasserver/api/tests/test_bcache.py

src/maasserver/api/tests/test_bcache_cacheset.py

src/maasserver/api/tests/test_fabrics.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_raid.py

src/maasserver/api/tests/test_vlans.py

src/maasserver/api/tests/test_volume_groups.py

src/maasserver/api/vlans.py

src/maasserver/enum.py

src/maasserver/forms.py

src/maasserver/migrations/0160_add_cache_set_model.py

src/maasserver/models/__init__.py

src/maasserver/models/blockdevice.py

src/maasserver/models/bootresource.py

src/maasserver/models/bootresourceset.py

src/maasserver/models/cacheset.py

src/maasserver/models/fabric.py

src/maasserver/models/filesystem.py

src/maasserver/models/filesystemgroup.py

src/maasserver/models/interface.py

src/maasserver/models/macaddress.py

src/maasserver/models/node.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/tests/test_bootresource.py

src/maasserver/models/tests/test_cacheset.py

src/maasserver/models/tests/test_fabric.py

src/maasserver/models/tests/test_filesystemgroup.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_macaddress.py

src/maasserver/models/tests/test_node.py

src/maasserver/node_action.py

src/maasserver/preseed_storage.py

src/maasserver/static/js/angular/controllers/add_hardware.js

src/maasserver/static/js/angular/controllers/node_details.js

src/maasserver/static/js/angular/controllers/nodes_list.js

src/maasserver/static/js/angular/controllers/tests/test_add_hardware.js

src/maasserver/static/js/angular/controllers/tests/test_node_details.js

src/maasserver/static/js/angular/directives/os_select.js

src/maasserver/static/js/angular/factories/general.js

src/maasserver/static/js/angular/factories/tests/test_general.js

src/maasserver/static/js/angular/services/validation.js

src/maasserver/static/partials/node-details.html

src/maasserver/static/partials/node-events.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/storage_layouts.py

src/maasserver/testing/factory.py

src/maasserver/tests/test_auth.py

src/maasserver/tests/test_forms_bcache.py

src/maasserver/tests/test_forms_cacheset.py

src/maasserver/tests/test_forms_helpers.py

src/maasserver/tests/test_forms_node.py

src/maasserver/tests/test_forms_raid.py

src/maasserver/tests/test_forms_volume_group.py

src/maasserver/tests/test_preseed_storage.py

src/maasserver/tests/test_storage_layouts.py

src/maasserver/urls_api.py

src/maasserver/utils/async.py

src/maasserver/utils/orm.py

src/maasserver/utils/osystems.py

src/maasserver/utils/tests/test_async.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/utils/tests/test_osystems.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/views.py

src/maasserver/websockets/handlers/general.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/tests/test_general.py

src/metadataserver/models/tests/test_commissioningscript.py

src/provisioningserver/dhcp/__init__.py

src/provisioningserver/drivers/power/__init__.py

src/provisioningserver/drivers/power/ipmi.py

src/provisioningserver/drivers/power/tests/test_ipmi.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/power/tests/test_poweraction.py

src/provisioningserver/tests/test_kernel_opts.py

Older »