Merge lp:~ricgard/maas/ram-capitalisation into lp:~maas-committers/maas/trunk
Proposed by
Richard McCartney
Status: | Merged |
---|---|
Approved by: | Richard McCartney |
Approved revision: | no longer in the source branch. |
Merged at revision: | 4328 |
Proposed branch: | lp:~ricgard/maas/ram-capitalisation |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
12 lines (+1/-1) 1 file modified
src/maasserver/static/partials/node-details.html (+1/-1) |
To merge this branch: | bzr merge lp:~ricgard/maas/ram-capitalisation |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Blake Rouse (community) | Approve | ||
Review via email: mp+272601@code.launchpad.net |
This proposal supersedes a proposal from 2015-09-28.
Commit message
Amending ram label on node details to be capitalised.
Description of the change
Changing 'Ram' to 'RAM' on the node details page.
To post a comment you must log in.
The attempt to merge lp:~ricgard/maas/ram-capitalisation into lp:maas failed. Below is the output from the failed tests.
Ign http:// security. ubuntu. com trusty-security InRelease nova.clouds. archive. ubuntu. com trusty InRelease security. ubuntu. com trusty-security Release.gpg nova.clouds. archive. ubuntu. com trusty-updates InRelease security. ubuntu. com trusty-security Release nova.clouds. archive. ubuntu. com trusty Release.gpg nova.clouds. archive. ubuntu. com trusty-updates Release.gpg nova.clouds. archive. ubuntu. com trusty Release nova.clouds. archive. ubuntu. com trusty-updates Release security. ubuntu. com trusty- security/ main Sources security. ubuntu. com trusty- security/ universe Sources nova.clouds. archive. ubuntu. com trusty/main Sources security. ubuntu. com trusty- security/ main amd64 Packages nova.clouds. archive. ubuntu. com trusty/universe Sources security. ubuntu. com trusty- security/ universe amd64 Packages security. ubuntu. com trusty- security/ main Translation-en nova.clouds. archive. ubuntu. com trusty/main amd64 Packages security. ubuntu. com trusty- security/ universe Translation-en 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 nova.clouds. archive. ubuntu. com trusty- updates/ universe Sources nova.clouds. archive. ubuntu. com trusty-updates/main amd64 Packages nova.clouds. archive. ubuntu. com trusty- updates/ universe amd64 Packages 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-jinja2 python-jsonschema python-lxml 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-pyparsing python- seamicroclient python-simplejson python-simples...
Ign http://
Hit http://
Ign 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://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Hit http://
Ign http://
Ign http://
Reading package lists...
sudo DEBIAN_
--