Merge lp:~blake-rouse/maas/fix-1472707-1.7 into lp:maas/1.7

Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 3379
Proposed branch: lp:~blake-rouse/maas/fix-1472707-1.7
Merge into: lp:maas/1.7
Diff against target: 20 lines (+2/-1)
1 file modified
src/provisioningserver/rpc/cluster.py (+2/-1)
To merge this branch: bzr merge lp:~blake-rouse/maas/fix-1472707-1.7
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+266625@code.launchpad.net

Commit message

Use CompressedAmpList for the ListBootImages RPC call.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Backport self-approval.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (123.2 KiB)

The attempt to merge lp:~blake-rouse/maas/fix-1472707-1.7 into lp:maas/1.7 failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Hit http://security.ubuntu.com trusty-security Release.gpg
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://security.ubuntu.com trusty-security Release
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Hit http://nova.clouds.archive.ubuntu.com trusty-updates Release
Hit http://security.ubuntu.com trusty-security/main Sources
Hit http://security.ubuntu.com trusty-security/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://security.ubuntu.com trusty-security/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://security.ubuntu.com trusty-security/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bson python-bzrlib python-celery python-convoy 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-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios py...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/rpc/cluster.py'
2--- src/provisioningserver/rpc/cluster.py 2014-12-08 16:50:57 +0000
3+++ src/provisioningserver/rpc/cluster.py 2015-07-31 20:47:37 +0000
4@@ -40,6 +40,7 @@
5 from provisioningserver.rpc import exceptions
6 from provisioningserver.rpc.arguments import (
7 Bytes,
8+ CompressedAmpList,
9 ParsedURL,
10 StructureAsJSON,
11 )
12@@ -58,7 +59,7 @@
13
14 arguments = []
15 response = [
16- (b"images", amp.AmpList(
17+ (b"images", CompressedAmpList(
18 [(b"osystem", amp.Unicode()),
19 (b"architecture", amp.Unicode()),
20 (b"subarchitecture", amp.Unicode()),

Subscribers

People subscribed via source and target branches

to all changes: