Merge lp:~rsalveti/media-hub/1409125 into lp:media-hub
Proposed by
Ricardo Salveti
Status: | Merged |
---|---|
Approved by: | Jim Hodapp |
Approved revision: | 110 |
Merged at revision: | 104 |
Proposed branch: | lp:~rsalveti/media-hub/1409125 |
Merge into: | lp:media-hub |
Diff against target: |
95 lines (+19/-12) 3 files modified
debian/rules (+1/-1) src/core/media/call-monitor/call_monitor.cpp (+15/-11) src/core/media/service_implementation.cpp (+3/-0) |
To merge this branch: | bzr merge lp:~rsalveti/media-hub/1409125 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jim Hodapp (community) | code | Approve | |
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
* service_
* Make sure account and connection are available when setting up account manager (patch from Gustavo Boiko)
* call_monitor: don't check caps when hooking up on/off signals, until bug 1409125 is fixed
* Enable parallel building
Description of the change
* service_
* Make sure account and connection are available when setting up account manager (patch from Gustavo Boiko)
* call_monitor: don't check caps when hooking up on/off signals, until bug 1409125 is fixed
To post a comment you must log in.
FAILED: Continuous integration, rev:108 jenkins. qa.ubuntu. com/job/ media-hub- ci/218/ jenkins. qa.ubuntu. com/job/ media-hub- vivid-amd64- ci/58/console jenkins. qa.ubuntu. com/job/ media-hub- vivid-armhf- ci/58 jenkins. qa.ubuntu. com/job/ media-hub- vivid-armhf- ci/58/artifact/ work/output/ *zip*/output. zip jenkins. qa.ubuntu. com/job/ media-hub- vivid-i386- ci/58/console
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
deb: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/media- hub-ci/ 218/rebuild
http://