LAVA Scheduler Tool

Merge lp://staging/~dpigott/lava-scheduler-tool/fix842524-add-token-file into lp://staging/lava-scheduler-tool

  1. fix842524-add-token-file
  2. Merge into trunk
Proposed by Zygmunt Krynicki
Status: Work in progress
Proposed branch: lp://staging/~dpigott/lava-scheduler-tool/fix842524-add-token-file
Merge into: lp://staging/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://staging/~dpigott/lava-scheduler-tool/fix842524-add-token-file
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Needs Fixing
Review via email: mp+79961@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Could you look at resolving the merge conflict?

review: Needs Fixing
Reply

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches