Merge lp://staging/~renatofilho/qtorganizer5-eds/fix-1347836 into lp://staging/qtorganizer5-eds
Proposed by
Renato Araujo Oliveira Filho
Status: | Merged |
---|---|
Approved by: | Bill Filler |
Approved revision: | 74 |
Merged at revision: | 82 |
Proposed branch: | lp://staging/~renatofilho/qtorganizer5-eds/fix-1347836 |
Merge into: | lp://staging/qtorganizer5-eds |
Prerequisite: | lp://staging/~renatofilho/qtorganizer5-eds/fix-1440878 |
Diff against target: |
192 lines (+57/-11) 5 files modified
organizer/qorganizer-eds-source-registry.cpp (+16/-2) organizer/qorganizer-eds-source-registry.h (+4/-1) tests/unittest/collections-test.cpp (+34/-4) tests/unittest/event-test.cpp (+0/-2) tests/unittest/run-eds-test.sh (+3/-2) |
To merge this branch: | bzr merge lp://staging/~renatofilho/qtorganizer5-eds/fix-1347836 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Kunal Parmar (community) | Approve | ||
PS Jenkins bot | continuous-integration | Needs Fixing | |
Ubuntu Phablet Team | Pending | ||
Review via email: mp+255726@code.staging.launchpad.net |
This proposal supersedes a proposal from 2014-10-21.
Commit message
Added a new extra metadata property in collection (read-only property).
To post a comment you must log in.
FAILED: Continuous integration, rev:66 jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-ci/ 184/ jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-utopic- amd64-ci/ 42/console jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-utopic- armhf-ci/ 42/console jenkins. qa.ubuntu. com/job/ qtorganizer5- eds-utopic- i386-ci/ 42/console
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/qtorganizer 5-eds-ci/ 184/rebuild
http://