Merge lp:~raof/mir/fix-all-the-CI into lp:mir
Proposed by
Chris Halse Rogers
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 2149 | ||||
Proposed branch: | lp:~raof/mir/fix-all-the-CI | ||||
Merge into: | lp:mir | ||||
Diff against target: |
31 lines (+5/-2) 2 files modified
src/client/mir_surface_api.cpp (+4/-2) tests/acceptance-tests/test_client_library.cpp (+1/-0) |
||||
To merge this branch: | bzr merge lp:~raof/mir/fix-all-the-CI | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Daniel van Vugt | Approve | ||
Mir development team | Pending | ||
Review via email: mp+244526@code.launchpad.net |
Commit message
Fix two bugs that CI catches that sneaked in while we were manually landing. (LP: #1401364)
Description of the change
Fix the changes that broke CI while we were manually landing things.
To post a comment you must log in.
I'm not sure if Alan's test case is correct, but this branch is not passing it: /bugs.launchpad .net/mir/ +bug/1401364/ comments/ 5
https:/
Wait and see what Jenkins says I guess.