Merge lp://staging/~ken-vandine/ubuntu-system-settings/lp1554621 into lp://staging/ubuntu-system-settings
Proposed by
Ken VanDine
Status: | Merged |
---|---|
Approved by: | Jonas G. Drange |
Approved revision: | 1617 |
Merged at revision: | 1628 |
Proposed branch: | lp://staging/~ken-vandine/ubuntu-system-settings/lp1554621 |
Merge into: | lp://staging/ubuntu-system-settings |
Diff against target: |
25 lines (+2/-2) 2 files modified
plugins/phone/CallForwarding.qml (+1/-1) plugins/wifi/CertPicker.qml (+1/-1) |
To merge this branch: | bzr merge lp://staging/~ken-vandine/ubuntu-system-settings/lp1554621 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jonas G. Drange (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Review via email: mp+289255@code.staging.launchpad.net |
Commit message
Bump Ubuntu.Content import to 1.3 to prevent mixed version imports
Description of the change
Bump Ubuntu.Content import to 1.3 to prevent mixed version imports
To post a comment you must log in.
FAILED: Continuous integration, rev:1617 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/2667/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 6781/console jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- vivid-amd64- ci/441 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- vivid-i386- ci/850 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-touch/ 5141/console jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6792 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 6792/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 28044
http://
Executed test runs:
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/2667/ rebuild
http://