pay-ui

Merge lp:~dobey/pay-ui/fix-application-file into lp:pay-ui

  1. fix-application-file
  2. Merge into first-branch
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 140
Merged at revision: 140
Proposed branch: lp:~dobey/pay-ui/fix-application-file
Merge into: lp:pay-ui
Diff against target: 15 lines (+1/-4)
1 file modified
com.canonical.payui_payui.application.in (+1/-4)
To merge this branch: bzr merge lp:~dobey/pay-ui/fix-application-file
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Charles Kerr (community) Approve
Review via email: mp+279790@code.launchpad.net

Commit message

Use the correct service id in the application file.

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

PASSED: Continuous integration, rev:140
http://jenkins.qa.ubuntu.com/job/pay-ui-ci/148/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-14.09-touch/28/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-14.09-armhf-ci/8
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-14.09-armhf-ci/8/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-touch/1000/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/58
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25843

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/pay-ui-ci/148/rebuild

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

LGTM. The Jenkins failures are unrelated?

review: Approve
Revision history for this message
dobey (dobey) wrote :

Yes.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/pay-ui-autolanding/76/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-14.09-armhf/59
    SUCCESS: http://jenkins.qa.ubuntu.com/job/pay-ui-14.09-armhf-autolanding/5
        deb: http://jenkins.qa.ubuntu.com/job/pay-ui-14.09-armhf-autolanding/5/artifact/work/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)
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
1=== modified file 'com.canonical.payui_payui.application.in'
2--- com.canonical.payui_payui.application.in 2014-07-30 19:01:50 +0000
3+++ com.canonical.payui_payui.application.in 2015-12-07 14:51:42 +0000
4@@ -4,10 +4,7 @@
5 <description>Pay UI</description>
6
7 <services>
8- <service id="payui">
9- <description>Client UI for purchases</description>
10- </service>
11- <service id="payui-sandbox">
12+ <service id="ubuntuone">
13 <description>Client UI for purchases</description>
14 </service>
15 </services>

Subscribers

People subscribed via source and target branches

to all changes: