Merge lp://qastaging/~blake-rouse/maas/fix-1460643 into lp://qastaging/~maas-committers/maas/trunk
Proposed by
Blake Rouse
Status: | Merged |
---|---|
Approved by: | Blake Rouse |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3975 |
Proposed branch: | lp://qastaging/~blake-rouse/maas/fix-1460643 |
Merge into: | lp://qastaging/~maas-committers/maas/trunk |
Diff against target: |
175 lines (+33/-35) 3 files modified
src/maasserver/api/blockdevices.py (+14/-16) src/maasserver/api/tests/test_blockdevice.py (+14/-14) src/maasserver/urls_api.py (+5/-5) |
To merge this branch: | bzr merge lp://qastaging/~blake-rouse/maas/fix-1460643 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | Approve | ||
Review via email: mp+260713@code.qastaging.launchpad.net |
Commit message
Rename the PhysicalBlockDevice API to just BlockDeviceAPI.
This will allow 1.8 to line up with 1.9 on the same endpoint to adjust tags on block devices.
To post a comment you must log in.
The attempt to merge lp:~blake-rouse/maas/fix-1460643 into lp:maas failed. Below is the output from the failed tests.
Ign http:// security. ubuntu. com trusty-security InRelease security. ubuntu. com trusty-security Release.gpg security. ubuntu. com trusty-security Release nova.clouds. archive. ubuntu. com trusty InRelease nova.clouds. archive. ubuntu. com trusty-updates InRelease nova.clouds. archive. ubuntu. com trusty Release.gpg nova.clouds. archive. ubuntu. com trusty-updates Release.gpg [933 B] nova.clouds. archive. ubuntu. com trusty Release nova.clouds. archive. ubuntu. com trusty-updates Release [63.5 kB] security. ubuntu. com trusty- security/ main Sources security. ubuntu. com trusty- security/ universe Sources security. ubuntu. com trusty- security/ main amd64 Packages nova.clouds. archive. ubuntu. com trusty/main Sources security. ubuntu. com trusty- security/ universe amd64 Packages security. ubuntu. com trusty- security/ main Translation-en security. ubuntu. com trusty- security/ universe Translation-en nova.clouds. archive. ubuntu. com trusty/universe Sources nova.clouds. archive. ubuntu. com trusty/main amd64 Packages nova.clouds. archive. ubuntu. com trusty/universe amd64 Packages nova.clouds. archive. ubuntu. com trusty/main Translation-en nova.clouds. archive. ubuntu. com trusty/universe Translation-en nova.clouds. archive. ubuntu. com trusty-updates/main Sources [206 kB] nova.clouds. archive. ubuntu. com trusty- updates/ universe Sources [118 kB] nova.clouds. archive. ubuntu. com trusty-updates/main amd64 Packages [525 kB] nova.clouds. archive. ubuntu. com trusty- updates/ universe amd64 Packages [282 kB] nova.clouds. archive. ubuntu. com trusty-updates/main Translation-en nova.clouds. archive. ubuntu. com trusty- updates/ universe Translation-en nova.clouds. archive. ubuntu. com trusty/main Translation-en_US nova.clouds. archive. ubuntu. com trusty/universe Translation-en_US FRONTEND= noninteractive apt-get -y \ no-install- recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium- chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery- hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python- django- piston python-django-south python- djorm-ext- pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-iscpy python-jinja2 python-jsonschema python-lockfile python-lxml python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-p...
Hit http://
Hit http://
Ign http://
Ign http://
Hit http://
Get:1 http://
Hit http://
Get:2 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:3 http://
Get:4 http://
Get:5 http://
Get:6 http://
Hit http://
Hit http://
Ign http://
Ign http://
Fetched 1,196 kB in 3s (396 kB/s)
Reading package lists...
sudo DEBIAN_
--