Merge lp://qastaging/~pwlars/ubuntu-test-cases/default-wifi-location into lp://qastaging/ubuntu-test-cases/touch
Proposed by
Paul Larson
Status: | Merged |
---|---|
Merged at revision: | 323 |
Proposed branch: | lp://qastaging/~pwlars/ubuntu-test-cases/default-wifi-location |
Merge into: | lp://qastaging/ubuntu-test-cases/touch |
Diff against target: |
12 lines (+1/-1) 1 file modified
scripts/provision.sh (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~pwlars/ubuntu-test-cases/default-wifi-location |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Francis Ginther | Approve | ||
Para Siva (community) | Approve | ||
Review via email: mp+239094@code.qastaging.launchpad.net |
Description of the change
Depends on lp:~pwlars/charms/trusty/jenkins-remote-slave/wifi-conf-location-change
I'm not sure if we should worry too much about preserving backwards compatibility. I'd hope that most people aren't lazy like me and are passing NETWORK_FILE if they run this locally rather than actually putting a file in /home/ubuntu/
For production, I've already copied this file over so if this branch lands first, it would be fine.
To post a comment you must log in.
Approve.