Mir

Merge lp://qastaging/~afrantzis/mir/base-not-default-config into lp://qastaging/mir

  1. base-not-default-config
  2. Merge into development-branch
Proposed by Alexandros Frantzis
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 3053
Proposed branch: lp://qastaging/~afrantzis/mir/base-not-default-config
Merge into: lp://qastaging/mir
Diff against target: 147 lines (+15/-15)
6 files modified
include/server/mir/shell/display_configuration_controller.h (+1/-1)
src/server/scene/mediating_display_changer.cpp (+1/-1)
src/server/scene/mediating_display_changer.h (+1/-1)
tests/acceptance-tests/test_client_surface_events.cpp (+2/-2)
tests/acceptance-tests/test_display_configuration.cpp (+1/-1)
tests/unit-tests/scene/test_mediating_display_changer.cpp (+9/-9)
To merge this branch: bzr merge lp://qastaging/~afrantzis/mir/base-not-default-config
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+275535@code.qastaging.launchpad.net

Commit message

scene,shell: Be consistent and use 'base' configuration not 'default'

Description of the change

scene,shell: Be consistent and use 'base' configuration not 'default'

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

PASSED: Continuous integration, rev:3052
http://jenkins.qa.ubuntu.com/job/mir-ci/5387/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3526
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4561
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/519/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1541
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1541/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/519
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/519/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4562
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4562/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7187
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/24513
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/520/console

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

review: Approve (continuous-integration)
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

=== modified file 'include/server/mir/shell/display_configuration_controller.h'

Server API break.

review: Approve

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