build(flux): update flux to master and change renamed structs #22361
Conversation
This file contains 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
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.
Closes #22319
Backports #22281
This is a mostly clean backport, intended to make it easier on us when we update flux to the latest version for the next
2.0release. It does update the flux version, but I'm not including a changelog entry right now since we will update it again before the next release.The only somewhat notable difference between this backport and the original is that in the original, the file
pkg/limiter/fixed_test.gocontains a small formatting fix here in a part of code that does not exist in the 2.0 branch. The referenced code was added in #21621, which is not something that was backported to2.0.