chore: merge v4 into main #1430
Merged
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
(cherry picked from commit c464bfd)
(cherry picked from commit 5301265)
(cherry picked from commit f64aa9b)
(cherry picked from commit 70ba3fd)
(cherry picked from commit 73a05e6)
(cherry picked from commit 34864ff)
(cherry picked from commit eaa7300)
(cherry picked from commit 3b146b0)
# Conflicts: # .github/workflows/acceptance-tests.yml # CHANGELOG.md # Makefile # internal/schemautil/userconfig/apiconvert/fromapi_test.go # internal/schemautil/userconfig/util.go
Serpentiel
force-pushed
the
aleks-chore-rebase-with-v4-6-11-2023
branch
from
39b0fb0 to
c408675
Compare
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.
About this change—what it does
merges
v4intomainto keep things up-to-dateWhy this way
to keep things up-to-date