Merge lp:~unity-api-team/unity-scopes-shell/today-scope-crash into lp:unity-scopes-shell/rtm-14.09
Proposed by
Pete Woods
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Pete Woods | ||||
Approved revision: | 133 | ||||
Merged at revision: | 134 | ||||
Proposed branch: | lp:~unity-api-team/unity-scopes-shell/today-scope-crash | ||||
Merge into: | lp:unity-scopes-shell/rtm-14.09 | ||||
Prerequisite: | lp:~unity-api-team/unity-scopes-shell/geoip-thread-affinity-fix | ||||
Diff against target: |
30 lines (+10/-0) 2 files modified
src/Unity/categories.cpp (+8/-0) src/Unity/categories.h (+2/-0) |
||||
To merge this branch: | bzr merge lp:~unity-api-team/unity-scopes-shell/today-scope-crash | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Marcus Tomlinson (community) | Approve | ||
Paweł Stołowski | Pending | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email:
|
This proposal supersedes a proposal from 2014-11-19.
Commit message
Fix today scope crash
Description of the change
Fix today scope crash
To post a comment you must log in.
PASSED: Continuous integration, rev:165 jenkins. qa.ubuntu. com/job/ unity-scopes- shell-ci/ 262/ jenkins. qa.ubuntu. com/job/ unity-scopes- shell-vivid- amd64-ci/ 4 jenkins. qa.ubuntu. com/job/ unity-scopes- shell-vivid- armhf-ci/ 4 jenkins. qa.ubuntu. com/job/ unity-scopes- shell-vivid- armhf-ci/ 4/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ unity-scopes- shell-vivid- i386-ci/ 4
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- shell-ci/ 262/rebuild
http://