Skip to content

[Backport 2.3] [2.x] Change the version to remove deprecated code of adding node name into log pattern of log4j property file#4574

Merged
tlfeng merged 1 commit into2.3from
backport/backport-4569-to-2.3
Sep 22, 2022
Merged

[Backport 2.3] [2.x] Change the version to remove deprecated code of adding node name into log pattern of log4j property file#4574
tlfeng merged 1 commit into2.3from
backport/backport-4569-to-2.3

Conversation

@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor

Backport 83b0ba1 from #4569

…e into log pattern of log4j property file (#4569)

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit 83b0ba1)
@opensearch-trigger-bot opensearch-trigger-bot bot requested review from a team and reta as code owners September 22, 2022 21:07
@tlfeng tlfeng added deprecate backport 2.3 Backports to 2.3 branch labels Sep 22, 2022
@github-actions
Copy link
Copy Markdown
Contributor

Gradle Check (Jenkins) Run Completed with:

@tlfeng tlfeng merged commit 24043ea into 2.3 Sep 22, 2022
@tlfeng tlfeng deleted the backport/backport-4569-to-2.3 branch September 22, 2022 21:45
@opensearch-trigger-bot
Copy link
Copy Markdown
Contributor Author

The backport to 2.3 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-2.3 2.3
# Navigate to the new working tree
cd .worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-4574-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 24043ea77bee8fca31ca29f0fc49d8c36bb1e782
# Push it to GitHub
git push --set-upstream origin backport/backport-4574-to-2.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.3

Then, create a pull request where the base branch is 2.3 and the compare/head branch is backport/backport-4574-to-2.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 2.3 Backports to 2.3 branch deprecate

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant