Merge lp://qastaging/~matthew-hart/lava-lab/bug1214807 into lp://qastaging/lava-lab
Proposed by
Matthew Hart
Status: | Merged |
---|---|
Merged at revision: | 291 |
Proposed branch: | lp://qastaging/~matthew-hart/lava-lab/bug1214807 |
Merge into: | lp://qastaging/lava-lab |
Diff against target: |
59 lines (+26/-8) 1 file modified
lava/webinterface/init.sls (+26/-8) |
To merge this branch: | bzr merge lp://qastaging/~matthew-hart/lava-lab/bug1214807 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tyler Baker | Approve | ||
Review via email: mp+183617@code.qastaging.launchpad.net |
Description of the change
Stop salt from trying to create a settings.conf in /s/l/i/staging on control, and an apache config file on staging.
Both of these were causing staging to not be upgraded to tip by the cron job.
To post a comment you must log in.
Approved.