Merge lp:~dandrader/mir/switchingBundle_lp1270964 into lp:mir
Proposed by
Daniel d'Andrada
Status: | Superseded |
---|---|
Proposed branch: | lp:~dandrader/mir/switchingBundle_lp1270964 |
Merge into: | lp:mir |
Diff against target: |
91 lines (+38/-2) 3 files modified
src/server/compositor/switching_bundle.cpp (+3/-1) src/server/compositor/switching_bundle.h (+3/-0) tests/unit-tests/compositor/test_switching_bundle.cpp (+32/-1) |
To merge this branch: | bzr merge lp:~dandrader/mir/switchingBundle_lp1270964 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Needs Fixing | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Mir development team | Pending | ||
Review via email:
|
This proposal has been superseded by a proposal from 2014-01-21.
Commit message
Only use SwitchingBundle
Otherwise SwitchingBundle
(LP: #1270964)
Description of the change
Fixes bug 1270964.
To post a comment you must log in.
FAILED: Continuous integration, rev:1342 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- ci/689/ jenkins. qa.ubuntu. com/job/ mir-android- trusty- i386-build/ 677 jenkins. qa.ubuntu. com/job/ mir-clang- trusty- amd64-build/ 673 jenkins. qa.ubuntu. com/job/ mir-mediumtests -trusty- touch/279/ console jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- amd64-ci/ 419/console jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- trusty- armhf-ci/ 423/console jenkins. qa.ubuntu. com/job/ mir-mediumtests -builder- trusty- armhf/279/ console
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/mir- team-mir- development- branch- ci/689/ rebuild
http://