Merge lp:~townsend/unity/fix-lp1451613-trusty into lp:unity/7.2
Proposed by
Christopher Townsend
Status: | Merged |
---|---|
Approved by: | Stephen M. Webb |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3831 |
Proposed branch: | lp:~townsend/unity/fix-lp1451613-trusty |
Merge into: | lp:unity/7.2 |
Diff against target: |
171 lines (+7/-45) 5 files modified
launcher/EdgeBarrierController.cpp (+1/-19) launcher/EdgeBarrierController.h (+0/-1) plugins/unityshell/src/unityshell.cpp (+4/-8) plugins/unityshell/src/unityshell.h (+2/-2) tests/test_edge_barrier_controller.cpp (+0/-15) |
To merge this branch: | bzr merge lp:~townsend/unity/fix-lp1451613-trusty |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stephen M. Webb (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+260944@code.launchpad.net |
Commit message
Revert rev. 3810 due to a crash being seen on Trusty when the lockscreen is activated.
To post a comment you must log in.
PASSED: Continuous integration, rev:3831 jenkins. qa.ubuntu. com/job/ unity-7. 2-ci/19/ jenkins. qa.ubuntu. com/job/ unity-7. 2-trusty- amd64-ci/ 19 jenkins. qa.ubuntu. com/job/ unity-7. 2-trusty- armhf-ci/ 19 jenkins. qa.ubuntu. com/job/ unity-7. 2-trusty- i386-ci/ 19
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity- 7.2-ci/ 19/rebuild
http://