Merge lp:~mir-team/platform-api/remove-mirserver into lp:platform-api
Proposed by
Alberto Aguirre
Status: | Merged |
---|---|
Approved by: | Alberto Aguirre |
Approved revision: | 315 |
Merged at revision: | 304 |
Proposed branch: | lp:~mir-team/platform-api/remove-mirserver |
Merge into: | lp:platform-api |
Prerequisite: | lp:~mir-team/platform-api/delete-deprecations |
Diff against target: |
322 lines (+7/-185) 11 files modified
debian/changelog (+1/-0) debian/ubuntu-application-api3-desktop.install (+0/-1) debian/ubuntu-application-api3-touch.install (+0/-1) src/ubuntu/application/common/CMakeLists.txt (+0/-2) src/ubuntu/application/common/mirclient/CMakeLists.txt (+4/-0) src/ubuntu/application/common/mirclient/ubuntu_application_api_mirclient.cpp (+2/-2) src/ubuntu/application/common/mircommon/CMakeLists.txt (+0/-23) src/ubuntu/application/common/mirserver/CMakeLists.txt (+0/-18) src/ubuntu/application/common/mirserver/ubuntu_application_api_mirserver.cpp (+0/-72) src/ubuntu/application/desktop/CMakeLists.txt (+0/-33) src/ubuntu/application/touch/CMakeLists.txt (+0/-33) |
To merge this branch: | bzr merge lp:~mir-team/platform-api/remove-mirserver |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Carr (community) | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Gerry Boland | Pending | ||
Alan Griffiths | Pending | ||
Kevin DuBois | Pending | ||
Review via email: mp+262284@code.launchpad.net |
This proposal supersedes a proposal from 2014-11-06.
Commit message
Remove the unused mirserver component
Description of the change
Remove the unused mirserver component
Rebased on top of lp:~mir-team/platform-api/delete-deprecations, hopefully to land together once and for all :)
To post a comment you must log in.
FAILED: Continuous integration, rev:266 jenkins. qa.ubuntu. com/job/ platform- api-ci/ 388/ jenkins. qa.ubuntu. com/job/ platform- api-vivid- amd64-ci/ 1 jenkins. qa.ubuntu. com/job/ platform- api-vivid- armhf-ci/ 1/console jenkins. qa.ubuntu. com/job/ platform- api-vivid- i386-ci/ 1
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/platform- api-ci/ 388/rebuild
http://