Merge lp://staging/~pwlars/charms/trusty/jenkins-remote-slave/wifi-conf-location-change into lp://staging/~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
Proposed by
Paul Larson
| Status: | Merged |
|---|---|
| Merged at revision: | 18 |
| Proposed branch: | lp://staging/~pwlars/charms/trusty/jenkins-remote-slave/wifi-conf-location-change |
| Merge into: | lp://staging/~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk |
| Diff against target: |
15 lines (+1/-4) 1 file modified
hooks/install.d/3000-ci-tools.sh (+1/-4) |
| To merge this branch: | bzr merge lp://staging/~pwlars/charms/trusty/jenkins-remote-slave/wifi-conf-location-change |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Para Siva (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Depends on lp:~pwlars/ubuntu-test-cases/default-wifi-location
We already keep some other config things there, so it's a much more reasonable default than our previous location. I've already hand copied this on heymann, so that if the other branch lands first, it won't cause any problems.
To post a comment you must log in.
Revision history for this message
| Para Siva (psivaa) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
