Merge lp:~seb128/ubuntu-system-settings/storage-correct-ini-info into lp:ubuntu-system-settings
Proposed by
Sebastien Bacher
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Ken VanDine | ||||
Approved revision: | 1164 | ||||
Merged at revision: | 1178 | ||||
Proposed branch: | lp:~seb128/ubuntu-system-settings/storage-correct-ini-info | ||||
Merge into: | lp:ubuntu-system-settings | ||||
Diff against target: |
61 lines (+13/-14) 2 files modified
plugins/about/click.cpp (+11/-13) plugins/about/click.h (+2/-1) |
||||
To merge this branch: | bzr merge lp:~seb128/ubuntu-system-settings/storage-correct-ini-info | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ken VanDine | Approve | ||
PS Jenkins bot | continuous-integration | Approve | |
Review via email:
|
Commit message
[storage] build the correct ini name rather than guessing it
Description of the change
[storage] build the correct ini name rather than guessing it
To post a comment you must log in.
PASSED: Continuous integration, rev:1164 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- ci/1715/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- utopic- touch/6346 jenkins. qa.ubuntu. com/job/ generic- mediumtests- utopic/ 4243 jenkins. qa.ubuntu. com/job/ ubuntu- system- settings- utopic- i386-ci/ 907 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- mako/5953 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7598 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- armhf/7598/ artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 15258 jenkins. qa.ubuntu. com/job/ autopilot- testrunner- otto-utopic/ 3599 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/4635 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- utopic- amd64/4635/ artifact/ work/output/ *zip*/output. zip
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/ubuntu- system- settings- ci/1715/ rebuild
http://