Merge lp://qastaging/~rbanffy/maas/bug-1454355-add-extra-nic-styling into lp://qastaging/~maas-committers/maas/trunk

Proposed by Ricardo Bánffy
Status: Merged
Approved by: Mike Pontillo
Approved revision: no longer in the source branch.
Merged at revision: 3934
Proposed branch: lp://qastaging/~rbanffy/maas/bug-1454355-add-extra-nic-styling
Merge into: lp://qastaging/~maas-committers/maas/trunk
Diff against target: 198 lines (+106/-21)
6 files modified
src/maasserver/static/css/maas-styles.css (+1/-1)
src/maasserver/static/js/angular/controllers/node_details.js (+10/-0)
src/maasserver/static/js/angular/controllers/tests/test_node_details.js (+44/-0)
src/maasserver/static/partials/node-details.html (+21/-19)
src/maasserver/static/scss/maas/components/_forms.scss (+29/-0)
src/maasserver/static/scss/maas/components/_placeholders.scss (+1/-1)
To merge this branch: bzr merge lp://qastaging/~rbanffy/maas/bug-1454355-add-extra-nic-styling
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+259811@code.qastaging.launchpad.net

Commit message

Apply style changes to Add MAC field and associated error message, change interface logic to reset form styles when addition is canceled with an active error.

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

Your commit message for this branch is very fage. You need to explain what was done and why.

I have some issues with this branch and need to be fixed, see inline comments. You also have a conflict that you need to resolve.

review: Needs Fixing
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good. Thanks for the fixes.

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

The attempt to merge lp:~rbanffy/maas/bug-1454355-add-extra-nic-styling into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Get:2 http://security.ubuntu.com trusty-security Release [63.5 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [63.5 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [81.4 kB]
Get:6 http://security.ubuntu.com trusty-security/universe Sources [25.2 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [272 kB]
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [104 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main 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
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [205 kB]
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [117 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [524 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [280 kB]
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
Fetched 1,738 kB in 3s (547 kB/s)
Reading package lists...
sudo DEBIAN_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-...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.