Merge lp://qastaging/~laney/indicator-datetime/eds-3.16 into lp://qastaging/indicator-datetime/15.10
Proposed by
Iain Lane
Status: | Merged |
---|---|
Approved by: | Iain Lane |
Approved revision: | 414 |
Merged at revision: | 418 |
Proposed branch: | lp://qastaging/~laney/indicator-datetime/eds-3.16 |
Merge into: | lp://qastaging/indicator-datetime/15.10 |
Diff against target: |
597 lines (+355/-30) 9 files modified
CMakeLists.txt (+1/-1) debian/changelog (+13/-0) debian/control (+1/-1) src/engine-eds.cpp (+69/-28) tests/CMakeLists.txt (+2/-0) tests/test-eds-ics-tzids-2.cpp (+88/-0) tests/test-eds-ics-tzids-2.ics (+38/-0) tests/test-eds-ics-tzids.cpp (+87/-0) tests/test-eds-ics-tzids.ics (+56/-0) |
To merge this branch: | bzr merge lp://qastaging/~laney/indicator-datetime/eds-3.16 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Iain Lane | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email:
|
Commit message
Update for e-d-s 3.16
Description of the change
Update to new e-d-s API
supersedes https:/
To post a comment you must log in.
FAILED: Continuous integration, rev:414 jenkins. qa.ubuntu. com/job/ indicator- datetime- ci/323/ jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-amd64- ci/13/console jenkins. qa.ubuntu. com/job/ indicator- datetime- wily-armhf- ci/13/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/indicator- datetime- ci/323/ rebuild
http://