Merge lp:~julian-edwards/maas/ignore-failure-from-new-bug-1386502 into lp:~maas-committers/maas/trunk
Proposed by
Julian Edwards
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Julian Edwards | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 3333 | ||||
Proposed branch: | lp:~julian-edwards/maas/ignore-failure-from-new-bug-1386502 | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
38 lines (+10/-0) 2 files modified
src/maasserver/models/node.py (+3/-0) src/maasserver/models/tests/test_node.py (+7/-0) |
||||
To merge this branch: | bzr merge lp:~julian-edwards/maas/ignore-failure-from-new-bug-1386502 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Newell Jensen (community) | Approve | ||
Review via email: mp+240534@code.launchpad.net |
Commit message
Prevent any failures when a node is NEW from trying to actually mark the node as failed; there is no corresponding failed state, it just needs to stay at NEW. Previously, this would traceback in the appserver.
To post a comment you must log in.
The attempt to merge lp:~julian-edwards/maas/ignore-failure-from-new-bug-1386502 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 [933 B] nova.clouds. archive. ubuntu. com trusty InRelease security. ubuntu. com trusty-security Release [62.0 kB] 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 [62.0 kB] security. ubuntu. com trusty- security/ main Sources [49.5 kB] nova.clouds. archive. ubuntu. com trusty/main Sources security. ubuntu. com trusty- security/ universe Sources [11.2 kB] security. ubuntu. com trusty- security/ main amd64 Packages [153 kB] security. ubuntu. com trusty- security/ universe amd64 Packages [51.2 kB] 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 [136 kB] nova.clouds. archive. ubuntu. com trusty- updates/ universe Sources [89.3 kB] nova.clouds. archive. ubuntu. com trusty-updates/main amd64 Packages [356 kB] nova.clouds. archive. ubuntu. com trusty- updates/ universe amd64 Packages [217 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 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-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-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted pyth...
Get:1 http://
Ign http://
Get:2 http://
Ign http://
Hit http://
Get:3 http://
Hit http://
Get:4 http://
Get:5 http://
Hit http://
Get:6 http://
Get:7 http://
Get:8 http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Get:9 http://
Get:10 http://
Get:11 http://
Get:12 http://
Hit http://
Hit http://
Ign http://
Ign http://
Fetched 1,188 kB in 2s (398 kB/s)
Reading package lists...
sudo DEBIAN_
--