Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of Fix overly-eager jsonencode into v1.10 #35999

Conversation

github-actions[bot]
Copy link
Contributor

Backport

This PR is auto-generated from #35984 to be assessed for backporting due to the inclusion of the label 1.10-backport.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@radeksimko
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: unable to process merge commit: "3eadcc1ab223441a31ee0663ed37952fc43b056e", automatic backport requires rebase workflow

The below text is copied from the body of the original PR.


Fixes #35983

Target Release

1.9.9

Draft CHANGELOG entry

BUG FIXES

  • Simplify config generation (plan -generate-config-out) for string attributes that contain primitive types (e.g. numbers or booleans)

Overview of commits

@github-actions github-actions bot force-pushed the backport/fix-string-number-generate/distinctly-discrete-swine branch from f9eee01 to 5f1eb60 Compare November 13, 2024 15:47
@github-actions github-actions bot requested a review from radeksimko November 13, 2024 15:47
@radeksimko radeksimko marked this pull request as ready for review November 13, 2024 15:47
@radeksimko radeksimko merged commit 0c6f3cd into v1.10 Nov 13, 2024
5 of 6 checks passed
@radeksimko radeksimko deleted the backport/fix-string-number-generate/distinctly-discrete-swine branch November 13, 2024 15:52
Copy link
Contributor Author

Reminder for the merging maintainer: if this is a user-visible change, please update the changelog on the appropriate release branch.

Copy link
Contributor Author

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 14, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants