Commit dfa218f
committed
merge: update cz/hitl-v2 with its base (feat/v2-workflows-bg-default)
The base got its own release-1.11.0 merge (#13507), resolved independently of
this branch's, so the two collided on the files both touched. Resolutions:
workflow.py keeps this branch's HITL routes and job_id/resume threading; the
build.py and workflow_execution.py conflicts were comment wording only, taking
the base's. .secrets.baseline regenerated.3 files changed
Lines changed: 3275 additions & 6547 deletions
0 commit comments