Merge lp://staging/~justinmcp/webbrowser-app/logging-option into lp://staging/webbrowser-app

Proposed by Justin McPherson
Status: Work in progress
Proposed branch: lp://staging/~justinmcp/webbrowser-app/logging-option
Merge into: lp://staging/webbrowser-app
Diff against target: 96 lines (+26/-1)
4 files modified
src/app/webcontainer/WebApp.qml (+3/-0)
src/app/webcontainer/webapp-container.cpp (+21/-0)
src/app/webcontainer/webapp-container.h (+1/-1)
src/app/webcontainer/webapp-container.qml (+1/-0)
To merge this branch: bzr merge lp://staging/~justinmcp/webbrowser-app/logging-option
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+213587@code.staging.launchpad.net

Commit message

Support passing logging categories to web app.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
474. By Justin McPherson

merge with trunk

475. By Justin McPherson

merge from trunk

476. By Justin McPherson

merge from trunk

477. By Justin McPherson

merge from trunk

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:477
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/743/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4783/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/4157/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-amd64-ci/245
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/245
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-armhf-ci/245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-trusty-i386-ci/245
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4129/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4915
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4915/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4364
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4364/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/6390/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5948

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/webbrowser-app-ci/743/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Olivier Tilloy (osomon) wrote :

Is this change still valid/wanted?

Revision history for this message
Alexandre Abreu (abreu-alexandre) wrote :

It requires

https://code.launchpad.net/~justinmcp/unity-webapps-qml/logging/+merge/213586

first in order to be merged. I am putting it as WIP until then,

Unmerged revisions

477. By Justin McPherson

merge from trunk

476. By Justin McPherson

merge from trunk

475. By Justin McPherson

merge from trunk

474. By Justin McPherson

merge with trunk

473. By Justin McPherson

Support passing logging categories to unity web app.

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

to status/vote changes: