Merge lp://qastaging/~alan-griffiths/mir/fix-1593655 into lp://qastaging/mir
Proposed by
Alan Griffiths
Status: | Merged |
---|---|
Merged at revision: | 3588 |
Proposed branch: | lp://qastaging/~alan-griffiths/mir/fix-1593655 |
Merge into: | lp://qastaging/mir |
Diff against target: |
250 lines (+112/-2) 9 files modified
include/server/mir/server.h (+4/-0) src/include/server/mir/default_server_configuration.h (+1/-0) src/include/server/mir/server_configuration.h (+3/-1) src/server/default_server_configuration.cpp (+5/-0) src/server/display_server.cpp (+5/-1) src/server/server.cpp (+22/-0) src/server/symbols.map (+8/-0) tests/acceptance-tests/CMakeLists.txt (+1/-0) tests/acceptance-tests/server_stop_callback.cpp (+63/-0) |
To merge this branch: | bzr merge lp://qastaging/~alan-griffiths/mir/fix-1593655 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mir CI Bot | continuous-integration | Needs Fixing | |
Chris Halse Rogers | Approve | ||
Kevin DuBois (community) | Approve | ||
Review via email:
|
Commit message
Add callback option to notify that the server is about to stop
To post a comment you must log in.
PASSED: Continuous integration, rev:3586 /mir-jenkins. ubuntu. com/job/ mir-ci/ 1256/ /mir-jenkins. ubuntu. com/job/ build-mir/ 1465 /mir-jenkins. ubuntu. com/job/ build-0- fetch/1517 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 1508 /mir-jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 1508 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 1479 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= clang,platform= mesa,release= vivid+overlay/ 1479/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 1479 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= amd64,compiler= gcc,platform= mesa,release= xenial/ 1479/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 1479 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= cross-armhf, compiler= gcc,platform= android, release= vivid+overlay/ 1479/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1479 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= android, release= vivid+overlay/ 1479/artifact/ output/ *zip*/output. zip /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 1479 /mir-jenkins. ubuntu. com/job/ build-2- binpkg- mir/arch= i386,compiler= gcc,platform= mesa,release= xenial/ 1479/artifact/ output/ *zip*/output. zip
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
Click here to trigger a rebuild: /mir-jenkins. ubuntu. com/job/ mir-ci/ 1256/rebuild
https:/