Merge lp://qastaging/~fourdollars/indicator-power/zesty into lp://qastaging/indicator-power

Proposed by Shih-Yuan Lee
Status: Merged
Merge reported by: Shih-Yuan Lee
Merged at revision: not available
Proposed branch: lp://qastaging/~fourdollars/indicator-power/zesty
Merge into: lp://qastaging/indicator-power
Diff against target: 528 lines (+134/-73)
7 files modified
src/device-provider-upower.c (+5/-1)
src/device.c (+37/-5)
src/device.h (+4/-1)
src/service.c (+18/-6)
src/testing.c (+2/-1)
tests/test-device.cc (+62/-56)
tests/test-notify.cc (+6/-3)
To merge this branch: bzr merge lp://qastaging/~fourdollars/indicator-power/zesty
Reviewer Review Type Date Requested Status
Sebastien Bacher Needs Information
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+314124@code.qastaging.launchpad.net

Description of the change

Make device with power supply has higher sorting priority. (LP: #1100546)

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:302
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~fourdollars/indicator-power/zesty/+merge/314124/+edit-commit-message

https://jenkins.canonical.com/unity-api-1/job/lp-indicator-power-ci/4/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1313/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1320
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1097
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1097/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1097
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1097/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1097/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1097
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1097/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1097
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1097/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1097/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-indicator-power-ci/4/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Sebastien Bacher (seb128) wrote :
review: Needs Information
Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

> that's superseeded by https://code.launchpad.net/~charlesk/indicator-
> power/lp-1100546-not-present-mouse/+merge/314869 right?
Yes

Revision history for this message
Shih-Yuan Lee (fourdollars) wrote :

> > that's superseeded by https://code.launchpad.net/~charlesk/indicator-
> > power/lp-1100546-not-present-mouse/+merge/314869 right?
> Yes
Sorry, I mean https://code.launchpad.net/~charlesk/indicator-power/lp-1100546-not-present-mouse/+merge/314869 just used the same code of this merge proposal.

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