Merge lp:~alan-griffiths/mir/fix-1201436 into lp:mir
Proposed by
Alan Griffiths
Status: | Merged |
---|---|
Approved by: | kevin gunn |
Approved revision: | no longer in the source branch. |
Merged at revision: | 1099 |
Proposed branch: | lp:~alan-griffiths/mir/fix-1201436 |
Merge into: | lp:mir |
Prerequisite: | lp:~alan-griffiths/mir/client-dies-without-server |
Diff against target: |
162 lines (+39/-9) 6 files modified
src/client/mir_client_library.cpp (+4/-3) src/client/mir_connection.cpp (+10/-2) src/client/mir_wait_handle.cpp (+13/-0) src/client/mir_wait_handle.h (+2/-0) src/client/rpc/mir_socket_rpc_channel.cpp (+9/-4) src/client/rpc/mir_socket_rpc_channel.h (+1/-0) |
To merge this branch: | bzr merge lp:~alan-griffiths/mir/fix-1201436 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Daniel van Vugt | Needs Fixing | ||
Kevin DuBois (community) | Approve | ||
Review via email: mp+188535@code.launchpad.net |
Commit message
client: Fix race in connection failures
Description of the change
client: Fix race in connection failures
To post a comment you must log in.
PASSED: Continuous integration, rev:1097 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- ci/62/ jenkins. qa.ubuntu. com/job/ mir-android- saucy-i386- build/2190 jenkins. qa.ubuntu. com/job/ mir-clang- saucy-amd64- build/2075 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- saucy-amd64- ci/62 jenkins. qa.ubuntu. com/job/ mir-team- mir-development -branch- saucy-amd64- ci/62/artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins: 8080/job/ mir-team- mir-development -branch- ci/62/rebuild
http://