Merge lp:~pwlars/uci-maas-services/krillin-04-system-apps into lp:uci-maas-services

Proposed by Paul Larson
Status: Merged
Approved by: Paul Larson
Approved revision: 14
Merged at revision: 14
Proposed branch: lp:~pwlars/uci-maas-services/krillin-04-system-apps
Merge into: lp:uci-maas-services
Diff against target: 21 lines (+2/-2)
1 file modified
devices.yaml (+2/-2)
To merge this branch: bzr merge lp:~pwlars/uci-maas-services/krillin-04-system-apps
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+297076@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

Approving, since this is already deployed

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'devices.yaml'
--- devices.yaml 2016-03-23 15:37:16 +0000
+++ devices.yaml 2016-06-10 15:12:42 +0000
@@ -9,7 +9,7 @@
9 to: adb-host9 to: adb-host
10 options:10 options:
11 slave_name: arale-0111 slave_name: arale-01
12 master_url: http://dev-jenkins.ubuntu-ci:808012 master_url: http://unity8-jenkins-be.internal:8080
13 lp_user: ci-jenkins-ro13 lp_user: ci-jenkins-ro
14 lp_email: ci-jenkins-ro@lists.canonical.com14 lp_email: ci-jenkins-ro@lists.canonical.com
15 arale02-slave:15 arale02-slave:
@@ -333,7 +333,7 @@
333 to: adb-host333 to: adb-host
334 options:334 options:
335 slave_name: krillin-04335 slave_name: krillin-04
336 master_url: http://dev-jenkins.ubuntu-ci:8080336 master_url: http://system-apps-jenkins-be.internal:8080/system-apps
337 lp_user: ci-jenkins-ro337 lp_user: ci-jenkins-ro
338 lp_email: ci-jenkins-ro@lists.canonical.com338 lp_email: ci-jenkins-ro@lists.canonical.com
339 krillin06-slave:339 krillin06-slave:

Subscribers

People subscribed via source and target branches