Migrate relevant 3.2 commits to the new branch structure #4188
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
* add oauth2MetadataUrl Signed-off-by: Axel Nennker <[email protected]> * update anchor Signed-off-by: Axel Nennker <[email protected]> --------- Signed-off-by: Axel Nennker <[email protected]>
handrews
added
the
approved pr port
ralfhandl
reviewed
Nov 12, 2024
ralfhandl
reviewed
Nov 12, 2024
Co-authored-by: Ralf Handl <[email protected]>
|
@ralfhandl I merged your nit even though this was a port :-) Could you and @mikekistler please re-approve? |
ralfhandl
approved these changes
Nov 12, 2024
|
@handrews Gladly, thanks! |
|
Changed to draft status to allow more discussion of the best way to add these and possibly other changes. There's more discussion on #4106 |
|
Looks like there would be schema changes to accompany these? |
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.
This includes the few commits that were:
v3.2.0-devv3.1.1-dev$ref, or undo-ing that removal (let's just skip the whole thing...)These were handled with
git format-patchandgit am, like we have been doing to sync different release lines. In some cases, I noticed that the anchors for the new fields were incorrect and fixed them as if they weregit ammerge conflicts (so there are not separate commits).So this should be as close to what's on
v3.2.0-devin theversions/3.2.0.mdfile as we need it to be. But not identical.