Ubuntu UI Toolkit

Merge lp://staging/~zsombi/ubuntu-ui-toolkit/alarm-regression-fix into lp://staging/ubuntu-ui-toolkit/staging

  1. alarm-regression-fix
  2. Merge into staging
Proposed by Zsombor Egri
Status: Merged
Approved by: Cris Dywan
Approved revision: 1420
Merged at revision: 1422
Proposed branch: lp://staging/~zsombi/ubuntu-ui-toolkit/alarm-regression-fix
Merge into: lp://staging/ubuntu-ui-toolkit/staging
Diff against target: 627 lines (+185/-91)
10 files modified
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_organizer.cpp (+19/-15)
modules/Ubuntu/Components/plugin/adapters/alarmsadapter_p.h (+33/-12)
modules/Ubuntu/Components/plugin/alarmmanager_p.cpp (+7/-8)
modules/Ubuntu/Components/plugin/alarmmanager_p.h (+1/-1)
modules/Ubuntu/Components/plugin/alarmmanager_p_p.h (+1/-3)
modules/Ubuntu/Components/plugin/ucalarm.cpp (+2/-0)
modules/Ubuntu/Components/plugin/ucalarmmodel.cpp (+3/-2)
tests/resources/alarm/AlarmDays.qml (+4/-4)
tests/resources/alarm/Alarms.qml (+55/-43)
tests/unit_x11/tst_components/tst_alarms.qml (+60/-3)
To merge this branch: bzr merge lp://staging/~zsombi/ubuntu-ui-toolkit/alarm-regression-fix
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Cris Dywan Pending
Review via email: mp+251096@code.staging.launchpad.net

Commit message

Alarm services regression fix.

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

FAILED: Continuous integration, rev:1420
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1485/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1553
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/212/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/215
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/215/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/212
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1384
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1551
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1551/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18389

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1485/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Looks to make sense (after a very long look, that is :-D)

Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

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