Merge lp://staging/~unity-api-team/unity-scopes-api/better-diagnostics into lp://staging/unity-scopes-api/devel
Proposed by
Marcus Tomlinson
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Michi Henning | ||||
Approved revision: | 531 | ||||
Merged at revision: | 531 | ||||
Proposed branch: | lp://staging/~unity-api-team/unity-scopes-api/better-diagnostics | ||||
Merge into: | lp://staging/unity-scopes-api/devel | ||||
Prerequisite: | lp://staging/~michihenning/unity-scopes-api/add_watch_errors | ||||
Diff against target: |
68 lines (+13/-5) 3 files modified
src/scopes/internal/zmq_middleware/ZmqObject.cpp (+3/-1) src/scopes/internal/zmq_middleware/ZmqRegistry.cpp (+4/-3) test/gtest/scopes/Invocation/Invocation_test.cpp (+6/-1) |
||||
To merge this branch: | bzr merge lp://staging/~unity-api-team/unity-scopes-api/better-diagnostics | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michi Henning (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Improved information provided by some exceptions. Client-side invocation logic now reports the operation name when a TimeoutException is thrown.
To post a comment you must log in.
PASSED: Continuous integration, rev:531 jenkins. qa.ubuntu. com/job/ unity-scopes- api-devel- ci/1309/ jenkins. qa.ubuntu. com/job/ unity-scopes- api-devel- vivid-amd64- ci/19 jenkins. qa.ubuntu. com/job/ unity-scopes- api-devel- vivid-armhf- ci/19 jenkins. qa.ubuntu. com/job/ unity-scopes- api-devel- vivid-armhf- ci/19/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-scopes- api-devel- vivid-i386- ci/19
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- scopes- api-devel- ci/1309/ rebuild
http://