Merge lp:~unity-api-team/hud/dbusmenu-safety-valve into lp:hud/14.04
Status: | Merged |
---|---|
Approved by: | Antti Kaijanmäki |
Approved revision: | 389 |
Merged at revision: | 389 |
Proposed branch: | lp:~unity-api-team/hud/dbusmenu-safety-valve |
Merge into: | lp:hud/14.04 |
Diff against target: |
67 lines (+19/-10) 1 file modified
service/DBusMenuCollector.cpp (+19/-10) |
To merge this branch: | bzr merge lp:~unity-api-team/hud/dbusmenu-safety-valve |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Antti Kaijanmäki (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email:
|
Commit message
Make the DBusMenu safety valve actually work this time
Description of the change
* Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
* Yes
* Did you build your software in a clean sbuild/pbuilder chroot or ppa?
* Yes
* Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
* Yes
* Has your component "TestPlan” been executed successfully on emulator, N4?
* Yes
* Has a 5 minute exploratory testing run been executed on N4?
* Yes
* If you changed the packaging (debian), did you subscribe a core-dev to this MP?
* N/A
* If you changed the UI, did you subscribe the design-reviewers to this MP?
* No change
* What components might get impacted by your changes?
* Unity7
* Unity8
* Have you requested review by the teams of these owning components?
* Yes
Check List:
https:/
Test Plan:
https:/
Silo:
https:/
PASSED: Continuous integration, rev:389 jenkins. qa.ubuntu. com/job/ hud-ci/ 268/ jenkins. qa.ubuntu. com/job/ hud-trusty- amd64-ci/ 119 jenkins. qa.ubuntu. com/job/ hud-trusty- armhf-ci/ 118 jenkins. qa.ubuntu. com/job/ hud-trusty- i386-ci/ 118
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/hud- ci/268/ rebuild
http://