Skip to content

Bug 2030949 - default timeout for viaduct is now 60 seconds (backport #7381)#7388

Merged
rvandermeulen merged 2 commits into
release-v152from
mergify/bp/release-v152/pr-7381
Jun 3, 2026
Merged

Bug 2030949 - default timeout for viaduct is now 60 seconds (backport #7381)#7388
rvandermeulen merged 2 commits into
release-v152from
mergify/bp/release-v152/pr-7381

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jun 2, 2026

Discussed this a little in #application-services-eng and there was general agreement, but asking for explicit review for people who own components which may be impacted.


This is an automatic backport of pull request #7381 done by Mergify.

@mergify mergify Bot added the conflicts label Jun 2, 2026
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jun 2, 2026

Cherry-pick of ed313da has failed:

On branch mergify/bp/release-v152/pr-7381
Your branch is up to date with 'origin/release-v152'.

You are currently cherry-picking commit ed313dae.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   components/viaduct/src/client.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mhammond mhammond force-pushed the mergify/bp/release-v152/pr-7381 branch from 28be64f to e67e66e Compare June 2, 2026 05:23
@mhammond mhammond removed the conflicts label Jun 2, 2026
@mhammond mhammond requested a review from DonalMe June 2, 2026 05:23
@DonalMe DonalMe requested review from rvandermeulen and removed request for DonalMe June 2, 2026 11:25
Copy link
Copy Markdown
Contributor

@rvandermeulen rvandermeulen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved for 152.0b8.

@rvandermeulen rvandermeulen enabled auto-merge (rebase) June 3, 2026 16:35
@rvandermeulen rvandermeulen merged commit e4bae80 into release-v152 Jun 3, 2026
13 checks passed
@rvandermeulen rvandermeulen deleted the mergify/bp/release-v152/pr-7381 branch June 3, 2026 17:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants