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

docs(changelog): add entry for renamed kong.conf properties #10310

Merged
merged 1 commit into from
Feb 16, 2023

Conversation

flrgh
Copy link
Contributor

@flrgh flrgh commented Feb 15, 2023

This adds a changelog entry for #10122.

@flrgh flrgh merged commit ee74ed9 into master Feb 16, 2023
@flrgh flrgh deleted the chore/tracing-property-changelog branch February 16, 2023 19:46
@mashapedeployment
Copy link
Contributor

The backport to release/3.2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release/3.2.x release/3.2.x
# Navigate to the new working tree
cd .worktrees/backport-release/3.2.x
# Create a new branch
git switch --create backport-10310-to-release/3.2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ee74ed9532e372898f8473598d2ab17f960e9d79
# Push it to GitHub
git push --set-upstream origin backport-10310-to-release/3.2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release/3.2.x

Then, create a pull request where the base branch is release/3.2.x and the compare/head branch is backport-10310-to-release/3.2.x.

flrgh added a commit that referenced this pull request Feb 16, 2023
dndx pushed a commit that referenced this pull request Feb 20, 2023
This was referenced Mar 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants