Merge lp:~alan-griffiths/mir/SessionMediator-session-race into lp:~mir-team/mir/trunk
Proposed by
Alan Griffiths
Status: | Merged |
---|---|
Approved by: | Alexandros Frantzis |
Approved revision: | no longer in the source branch. |
Merged at revision: | 824 |
Proposed branch: | lp:~alan-griffiths/mir/SessionMediator-session-race |
Merge into: | lp:~mir-team/mir/trunk |
Diff against target: |
274 lines (+110/-76) 4 files modified
include/server/mir/frontend/session_mediator.h (+3/-0) src/server/frontend/session_mediator.cpp (+91/-68) src/server/frontend/session_mediator_android.cpp (+8/-4) src/server/frontend/session_mediator_gbm.cpp (+8/-4) |
To merge this branch: | bzr merge lp:~alan-griffiths/mir/SessionMediator-session-race |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexandros Frantzis (community) | Approve | ||
Robert Ancell | Approve | ||
Kevin DuBois (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+173247@code.launchpad.net |
Commit message
frontend: Guard SessionMediator
Description of the change
frontend: Guard SessionMediator
This may be related to intermittent failures - e.g. 1198238 and/or 1195089 (I can't reproduce either reliably)
But nothing stopped SessionMediator
To post a comment you must log in.
PASSED: Continuous integration, rev:818 jenkins. qa.ubuntu. com/job/ mir-ci/ 923/ jenkins. qa.ubuntu. com/job/ mir-android- saucy-i386- build/1187 jenkins. qa.ubuntu. com/job/ mir-clang- saucy-amd64- build/1071 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 161 jenkins. qa.ubuntu. com/job/ mir-saucy- amd64-ci/ 161/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ mir-vm- ci-build/ ./distribution= quantal, flavor= amd64/566
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-ci/ 923/rebuild
http://