Mir

Merge lp://qastaging/~vanvugt/mir/revert-r2165 into lp://qastaging/mir

  1. revert-r2165
  2. Merge into development-branch
Proposed by Daniel van Vugt
Status: Merged
Approved by: Daniel van Vugt
Approved revision: no longer in the source branch.
Merged at revision: 2170
Proposed branch: lp://qastaging/~vanvugt/mir/revert-r2165
Merge into: lp://qastaging/mir
Diff against target: 589 lines (+267/-276)
2 files modified
playground/demo-shell/window_manager.cpp (+267/-273)
playground/demo-shell/window_manager.h (+0/-3)
To merge this branch: bzr merge lp://qastaging/~vanvugt/mir/revert-r2165
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Daniel van Vugt Approve
Chris Halse Rogers Approve
Review via email: mp+245063@code.qastaging.launchpad.net

Commit message

Revert r2165. It's the quickest and safest way to solve the regression
that it has caused (LP: #1403702)

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

PASSED: Continuous integration, rev:2168
http://jenkins.qa.ubuntu.com/job/mir-ci/2483/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/603
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/577
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/480
        deb: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/480/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/577
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/577/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3730
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16684

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2483/rebuild

review: Approve (continuous-integration)
Revision history for this message
Chris Halse Rogers (raof) wrote :

Yeah, does what it says on the tin.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/948/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/612
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/586
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-autolanding/128/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/586
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/586/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3738
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16692

review: Needs Fixing (continuous-integration)
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

Another spurious TestClientInput failure. Try again...

Revision history for this message
Daniel van Vugt (vanvugt) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (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