qtorganizer5-eds

Merge lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1371341 into lp://qastaging/qtorganizer5-eds

  1. fix-1371341
  2. Merge into trunk
Proposed by Renato Araujo Oliveira Filho
Status: Merged
Approved by: Bill Filler
Approved revision: 63
Merged at revision: 61
Proposed branch: lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1371341
Merge into: lp://qastaging/qtorganizer5-eds
Diff against target: 89 lines (+36/-3)
4 files modified
CMakeLists.txt (+1/-1)
debian/control (+1/-0)
organizer/qorganizer-eds-engine.cpp (+2/-2)
tests/unittest/recurrence-test.cpp (+32/-0)
To merge this branch: bzr merge lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1371341
Reviewer Review Type Date Requested Status
Bill Filler (community) Approve
Charles Kerr (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+235452@code.qastaging.launchpad.net

Commit message

Fixed recurrence events.

Only store the recurrence count if it is bigger than 0.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:61
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/156/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-amd64-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-i386-ci/14/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/156/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1371341 updated
62. By Renato Araujo Oliveira Filho

Added gvfs-daemons as build dependency to run unit tests.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:62
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/157/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-amd64-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-armhf-ci/15/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-i386-ci/15/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/157/rebuild

review: Needs Fixing (continuous-integration)
lp://qastaging/~renatofilho/qtorganizer5-eds/fix-1371341 updated
63. By Renato Araujo Oliveira Filho

Removed wrong comment on control file.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:63
http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-ci/158/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtorganizer5-eds-utopic-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtorganizer5-eds-ci/158/rebuild

review: Approve (continuous-integration)
Revision history for this message
Charles Kerr (charlesk) wrote :

LGTM.

review: Approve
Revision history for this message
Bill Filler (bfiller) wrote :

approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches