Merge lp:~vthompson/ubuntu-weather-app/reboot-translate-owm into lp:ubuntu-weather-app
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Victor Thompson on 2015-08-26 | ||||
Approved revision: | 104 | ||||
Merged at revision: | 104 | ||||
Proposed branch: | lp:~vthompson/ubuntu-weather-app/reboot-translate-owm | ||||
Merge into: | lp:ubuntu-weather-app | ||||
Diff against target: |
78 lines (+11/-8) 4 files modified
app/components/DayDelegate.qml (+1/-0) app/components/HomeTempInfo.qml (+1/-0) app/data/WeatherApi.js (+8/-8) debian/changelog (+1/-0) |
||||
To merge this branch: | bzr merge lp:~vthompson/ubuntu-weather-app/reboot-translate-owm | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve on 2015-08-26 | |
Andrew Hayzen | 2015-08-22 | Approve on 2015-08-25 | |
Review via email:
|
Commit message
* Get the condition text to be translated from the OWM API.
Description of the change
* Get the condition text to be translated from the OWM API.
PASSED: Continuous integration, rev:103
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
FAILED: Autolanding.
More details in the following jenkins job:
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
- 104. By Victor Thompson on 2015-08-26
-
Merge of reboot and resolve changelog conflict.
PASSED: Continuous integration, rev:104
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PASSED: Continuous integration, rev:102 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/222/ 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- utopic- amd64-ci/ 192 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- vivid-amd64- ci/222
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
Click here to trigger a rebuild: 91.189. 93.70:8080/ job/ubuntu- weather- app-reboot- ci/222/ rebuild
http://