Skip to content

Conversation

@pquentin
Copy link
Member

@pquentin pquentin commented Jan 2, 2025

It was added in 8.13, and made visible in our tests by an unrelated get_document_template YAML test: elastic/elasticsearch@c662aec...43e6fad. (Which means this can be tested with make api=cluster.get_component_template branch=main.)

@pquentin pquentin merged commit b85ea07 into main Jan 2, 2025
7 checks passed
@pquentin pquentin deleted the passthrough branch January 2, 2025 11:04
@github-actions
Copy link
Contributor

github-actions bot commented Jan 2, 2025

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

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

@github-actions
Copy link
Contributor

github-actions bot commented Jan 2, 2025

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

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

pquentin added a commit to pquentin/elasticsearch-specification that referenced this pull request Jan 2, 2025
@pquentin
Copy link
Member Author

pquentin commented Jan 2, 2025

💔 Some backports could not be created

Status Branch Result
8.x
8.17 Conflict resolution was aborted by the user

Manual backport

To create the backport manually run:

backport --pr 3404

Questions ?

Please refer to the Backport tool documentation

pquentin added a commit that referenced this pull request Jan 2, 2025
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.

3 participants