[GR-66294] Fix master-to-galahad merge conflict 19.06.2025 #11448
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It is always used for exception cases which can be better handled by just making the exception path a boundary. Those paths anyway don't merge with the main control-flow.
…ark' invocation: dynamically import 'graalos-load-tester' if missing, install missing dependencies (curl, wrk, wrk2, nginx, tinyinit), and generate the NIB file if it is missing.
PullRequest: graal/20937
PullRequest: graal/21069
oracle-contributor-agreement
bot
added
the
OCA Verified
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolve merge conflict