Merge lp://qastaging/~jonas-drange/ubuntu-webcatalog/1259856-upgrade-global-nav into lp://qastaging/ubuntu-webcatalog

Proposed by Jonas G. Drange
Status: Merged
Approved by: Jonas G. Drange
Approved revision: 196
Merged at revision: 194
Proposed branch: lp://qastaging/~jonas-drange/ubuntu-webcatalog/1259856-upgrade-global-nav
Merge into: lp://qastaging/ubuntu-webcatalog
Diff against target: 26 lines (+3/-3)
3 files modified
setup.py (+1/-1)
src/webcatalog/static/js/one-global-navigation-min.js (+1/-1)
src/webcatalog/static/js/one-global-navigation-templates-min.js (+1/-1)
To merge this branch: bzr merge lp://qastaging/~jonas-drange/ubuntu-webcatalog/1259856-upgrade-global-nav
Reviewer Review Type Date Requested Status
Michael Nelson (community) Approve
Review via email: mp+198984@code.qastaging.launchpad.net

Commit message

new menu item "discourse", expanding the amount of visible items

Description of the change

new menu item "discourse", expanding the amount of visible items

To post a comment you must log in.
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

Revision history for this message
Michael Nelson (michael.nelson) wrote :

10:24 < jgdx> Can anyone take a look at https://code.launchpad.net/~jonas-drange/ubuntu-webcatalog/1259856-upgrade-global-nav/+merge/198984 and https://code.launchpad.net/~jonas-drange/software-center-agent/1259856-upgrade-global-nav/+merge/198985 ? Trivial mps that have already been approved in https://code.launchpad.net/~jonas-drange/ubuntuone-servers/1259856-new-global-nav-item/+merge/198521
10:24 < jgdx> but for some reason I could not self-approve
10:25 -!- mfoord [<email address hidden>] has joined #u1-reviews
10:25 < jgdx> noodles, perhaps you could take a peek when you have some spare seconds? :) ^
10:26 < noodles> jgdx: sure - I'm just writing my "won't be around mostly today due to sickness email", but it sounds trivial... :)
10:26 < noodles> heh, already reviewed even. OK :-)

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (53.6 KiB)

The attempt to merge lp:~jonas-drange/ubuntu-webcatalog/1259856-upgrade-global-nav into lp:ubuntu-webcatalog failed. Below is the output from the failed tests.

[localhost] local: /usr/bin/python /usr/bin/virtualenv --no-site-packages virtualenv
The --no-site-packages flag is deprecated; it is now the default behavior.
New python executable in virtualenv/bin/python
Installing distribute.............................................................................................................................................................................................done.
Installing pip...............done.
[localhost] local: virtualenv/bin/pip install -r test_requirements.txt
Downloading/unpacking coverage (from -r test_requirements.txt (line 2))
  Running setup.py egg_info for package coverage

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
Downloading/unpacking mock (from -r test_requirements.txt (line 3))
  Running setup.py egg_info for package mock

    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
Downloading/unpacking piston-mini-client (from -r test_requirements.txt (line 4))
  Downloading piston-mini-client-0.7.5.tar.gz
  Running setup.py egg_info for package piston-mini-client

Downloading/unpacking oauthlib (from piston-mini-client->-r test_requirements.txt (line 4))
  Running setup.py egg_info for package oauthlib

Downloading/unpacking httplib2 (from piston-mini-client->-r test_requirements.txt (line 4))
  Running setup.py egg_info for package httplib2

Installing collected packages: coverage, mock, piston-mini-client, oauthlib, httplib2
  Running setup.py install for coverage
    building 'coverage.tracer' extension
    gcc -pthread -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wstrict-prototypes -fPIC -I/usr/include/python2.7 -c coverage/tracer.c -o build/temp.linux-x86_64-2.7/coverage/tracer.o
    gcc -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro build/temp.linux-x86_64-2.7/coverage/tracer.o -o build/lib.linux-x86_64-2.7/coverage/tracer.so

    warning: no previously-included files matching '*.pyc' found anywhere in distribution
    Installing coverage2 script to /mnt/tarmac/cache/ubuntu-webcatalog/merges/trunk/virtualenv/bin
    Installing coverage-2.7 script to /mnt/tarmac/cache/ubuntu-webcatalog/merges/trunk/virtualenv/bin
    Installing coverage script to /mnt/tarmac/cache/ubuntu-webcatalog/merges/trunk/virtualenv/bin
  Running setup.py install for mock

    warning: no files found matching '*.png' under directory 'docs'
    warning: no files found matching '*.css' under directory 'docs'
    warning: no files found matching '*.html' under directory 'docs'
    warning: no files found matching '*.js' under directory 'docs'
  Running setup.py install for piston-mini-client

  Running setup.py install for oauthlib

  Running setup.py install for httplib2

Successfully installe...

196. By Jonas G. Drange

require django1.5.4

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.

Subscribers

People subscribed via source and target branches