← Back to branch summary

~blake-rouse/maas/is-importing-2.1

~blake-rouse/maas/is-importing-2.1

Viewing all changes in revision 4604.2.8.

Committer: LaMont Jones
Date: 2016-01-25 14:10:29 UTC
mfrom: (4607 maas)
mto: This revision was merged to the branch mainline in revision 4613.
Revision ID: lamont@canonical.com-20160125141029-org6zbaxxu8mff70

Merge from trunk.

files modified:
docs/api_authentication.rst

docs/juju-quick-start.rst

docs/maascli.rst

docs/man/maas.8.rst

docs/networking.rst

docs/static-ips.rst

docs/storage.rst

docs/version.rst

etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh

man/maas.8

src/maas/settings.py

src/maascli/actions/tests/test_boot_resources_create.py

src/maascli/cli.py

src/maascli/tests/test_api.py

src/maascli/tests/test_auth.py

src/maascli/tests/test_utils.py

src/maascli/utils.py

src/maasserver/api/doc_handler.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_bcache.py

src/maasserver/api/tests/test_bcache_cacheset.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_boot_images.py

src/maasserver/api/tests/test_boot_resources.py

src/maasserver/api/tests/test_boot_source_selections.py

src/maasserver/api/tests/test_boot_sources.py

src/maasserver/api/tests/test_devices.py

src/maasserver/api/tests/test_dnsresourcerecords.py

src/maasserver/api/tests/test_dnsresources.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_domains.py

src/maasserver/api/tests/test_events.py

src/maasserver/api/tests/test_fabrics.py

src/maasserver/api/tests/test_fannetworks.py

src/maasserver/api/tests/test_filestorage.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_licensekey.py

src/maasserver/api/tests/test_machine.py

src/maasserver/api/tests/test_machines.py

src/maasserver/api/tests/test_network.py

src/maasserver/api/tests/test_networks.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_nodegroup.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_raid.py

src/maasserver/api/tests/test_spaces.py

src/maasserver/api/tests/test_ssl_key.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/api/tests/test_tag.py

src/maasserver/api/tests/test_user.py

src/maasserver/api/tests/test_version.py

src/maasserver/api/tests/test_vlans.py

src/maasserver/api/tests/test_volume_groups.py

src/maasserver/api/tests/test_zone.py

src/maasserver/api/tests/test_zones.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_storage_layouts.py

src/maasserver/urls.py

src/metadataserver/tests/test_api.py

src/provisioningserver/config.py

src/provisioningserver/dhcp/detect.py

src/provisioningserver/dhcp/tests/test_detect.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_tags.py

src/provisioningserver/upgrade_cluster.py

Show diffs side-by-side

added added

removed removed

docs/api_authentication.rst

docs/juju-quick-start.rst

docs/maascli.rst

docs/man/maas.8.rst

docs/networking.rst

docs/static-ips.rst

docs/storage.rst

docs/version.rst

etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh

src/maas/settings.py

src/maascli/actions/tests/test_boot_resources_create.py

src/maascli/cli.py

src/maascli/tests/test_api.py

src/maascli/tests/test_auth.py

src/maascli/tests/test_utils.py

src/maascli/utils.py

src/maasserver/api/doc_handler.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_bcache.py

src/maasserver/api/tests/test_bcache_cacheset.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_boot_images.py

src/maasserver/api/tests/test_boot_resources.py

src/maasserver/api/tests/test_boot_source_selections.py

src/maasserver/api/tests/test_boot_sources.py

src/maasserver/api/tests/test_devices.py

src/maasserver/api/tests/test_dnsresourcerecords.py

src/maasserver/api/tests/test_dnsresources.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_domains.py

src/maasserver/api/tests/test_events.py

src/maasserver/api/tests/test_fabrics.py

src/maasserver/api/tests/test_fannetworks.py

src/maasserver/api/tests/test_filestorage.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_licensekey.py

src/maasserver/api/tests/test_machine.py

src/maasserver/api/tests/test_machines.py

src/maasserver/api/tests/test_network.py

src/maasserver/api/tests/test_networks.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_nodegroup.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_raid.py

src/maasserver/api/tests/test_spaces.py

src/maasserver/api/tests/test_ssl_key.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/api/tests/test_tag.py

src/maasserver/api/tests/test_user.py

src/maasserver/api/tests/test_version.py

src/maasserver/api/tests/test_vlans.py

src/maasserver/api/tests/test_volume_groups.py

src/maasserver/api/tests/test_zone.py

src/maasserver/api/tests/test_zones.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_storage_layouts.py

src/maasserver/urls.py

src/metadataserver/tests/test_api.py

src/provisioningserver/config.py

src/provisioningserver/dhcp/detect.py

src/provisioningserver/dhcp/tests/test_detect.py

src/provisioningserver/tags.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_tags.py

src/provisioningserver/upgrade_cluster.py

Older »