Merge lp:~dpigott/lava-scheduler-tool/fix842524-add-token-file into lp:lava-scheduler-tool
Proposed by
Zygmunt Krynicki
Status: | Work in progress |
---|---|
Proposed branch: | lp:~dpigott/lava-scheduler-tool/fix842524-add-token-file |
Merge into: | lp:lava-scheduler-tool |
Diff against target: |
150 lines (+112/-3) (has conflicts) 1 file modified
lava_scheduler_tool/commands.py (+112/-3) Text conflict in lava_scheduler_tool/commands.py |
To merge this branch: | bzr merge lp:~dpigott/lava-scheduler-tool/fix842524-add-token-file |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Zygmunt Krynicki (community) | Needs Fixing | ||
Review via email: mp+79961@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 10. By Dave Pigott
-
Added authentiaction token file support to cancel-job
- 9. By Dave Pigott
-
Added authentiction token file support to submit-job
Could you look at resolving the merge conflict?