camera-app

Merge lp://staging/~phablet-team/camera-app/photo-editor into lp://staging/camera-app

  1. photo-editor
  2. Merge into trunk
Proposed by Bill Filler
Status: Merged
Approved by: Bill Filler
Approved revision: 443
Merged at revision: 502
Proposed branch: lp://staging/~phablet-team/camera-app/photo-editor
Merge into: lp://staging/camera-app
Diff against target: 177 lines (+77/-36)
2 files modified
PhotoEditorLoader.qml (+32/-0)
SlideshowView.qml (+45/-36)
To merge this branch: bzr merge lp://staging/~phablet-team/camera-app/photo-editor
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+249436@code.staging.launchpad.net

Commit message

dynamically check for editor

Description of the change

dynamically check for editor

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:441
http://jenkins.qa.ubuntu.com/job/camera-app-ci/382/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/78/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/142/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/607/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/776/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/308
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17989
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/717/console

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

review: Needs Fixing (continuous-integration)
lp://staging/~phablet-team/camera-app/photo-editor updated
442. By Bill Filler

fix merge conflict

443. By Bill Filler

revert

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

FAILED: Continuous integration, rev:443
http://jenkins.qa.ubuntu.com/job/camera-app-ci/383/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-amd64-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-armhf-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-vivid-i386-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/143/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/609/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/777/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/310
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17993
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/719/console

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

review: Needs Fixing (continuous-integration)

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