← Back to branch summary

~andreserl/maas/lp1665143

~andreserl/maas/lp1665143

« back to all changes in this revision

Viewing changes to src/maasserver/views/combo.py

Committer: Lee Trager
Date: 2017-02-03 23:47:03 UTC
mfrom: (5662.2.8 specify_scripts_commissioning)
mto: (5662.5.2 consolidate_userdata)
mto: This revision was merged to the branch mainline in revision 5701.
Revision ID: lee.trager@canonical.com-20170203234703-0u45jdctj9d4c5j4

Merged specify_scripts_commissioning into test_api.

files added:
src/maasserver/migrations/builtin/maasserver/0110_notification_category.py

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

src/maasserver/static/js/angular/services/tests/test_log.js

src/maasserver/static/js/angular/testing/setup.js

files removed:
docs/about.rst

docs/bootsources.rst

docs/configure.rst

docs/devices.rst

docs/dhcpsnippets.rst

docs/getting-help.rst

docs/ha.rst

docs/hardware-enablement-kernels.rst

docs/install.rst

docs/installing-ubuntu.rst

docs/ipv6.rst

docs/juju-quick-start.rst

docs/kernel-options.rst

docs/networking.rst

docs/nodes.rst

docs/orientation.rst

docs/os-support.rst

docs/packagerepositories.rst

docs/physical-zones.rst

docs/power-driver-capabilities.rst

docs/proxy.rst

docs/rack-configuration.rst

docs/sstreams-mirror.rst

docs/static-ips.rst

docs/storage.rst

docs/tags.rst

docs/troubleshooting.rst

src/maasserver/static/css/build.css.moved

files modified:
Makefile

docs/changelog.rst

docs/index.rst

docs/releases.rst

src/maasserver/api/results.py

src/maasserver/api/tests/test_commissioning.py

src/maasserver/models/notification.py

src/maasserver/models/tests/test_notification.py

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

src/maasserver/static/js/angular/directives/tests/test_power_parameters.js

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

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

src/maasserver/static/partials/dashboard.html

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

src/maasserver/views/combo.py

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

src/maastesting/fixtures.py

src/maastesting/tests/test_fixtures.py

src/metadataserver/models/scriptset.py

src/metadataserver/models/tests/test_scriptset.py

src/provisioningserver/drivers/pod/__init__.py

src/provisioningserver/drivers/pod/tests/test_base.py

src/provisioningserver/drivers/pod/tests/test_virsh.py

src/provisioningserver/drivers/pod/virsh.py

src/provisioningserver/rpc/arguments.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/pods.py

src/provisioningserver/rpc/tests/test_arguments.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_pods.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py

src/provisioningserver/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py

versions.cfg

Show diffs side-by-side

added added

removed removed

src/maasserver/views/combo.py

91

91

"js/angular/services/browser.js",

92

92

"js/angular/services/converter.js",

93

93

"js/angular/services/json.js",

94

"js/angular/services/log.js",

94

95

"js/angular/directives/accordion.js",

95

96

"js/angular/directives/boot_images.js",

96

97

"js/angular/directives/call_to_action.js",

Older »