Merge lp://staging/~canonical-platform-qa/qakit/fix_config into lp://staging/qakit
Proposed by
Santiago Baldassin
Status: | Merged |
---|---|
Approved by: | Sergio Cazzolato |
Approved revision: | 158 |
Merged at revision: | 158 |
Proposed branch: | lp://staging/~canonical-platform-qa/qakit/fix_config |
Merge into: | lp://staging/qakit |
Diff against target: |
88 lines (+11/-41) 4 files modified
qakit/config.py (+10/-0) qakit/config/__init__.py (+0/-14) qakit/config/config.py (+0/-26) qakit/ust/worker.py (+1/-1) |
To merge this branch: | bzr merge lp://staging/~canonical-platform-qa/qakit/fix_config |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sergio Cazzolato | Approve | ||
Review via email:
|
Commit message
Fixing the config conflicts
Description of the change
Fixing the config conflicts
To post a comment you must log in.
code lgtm