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 2.x] Array values are preserved (#1300) (#3095) #3120

Merged
merged 1 commit into from
Oct 25, 2024

Conversation

penghuo
Copy link
Collaborator

@penghuo penghuo commented Oct 25, 2024

Signed-off-by: Norman Jordan [email protected]
(cherry picked from commit e109417)

Description

Backport. #3095

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • New functionality has javadoc added.
  • New functionality has a user manual doc added.
  • API changes companion pull request created.
  • Commits are signed per the DCO using --signoff.
  • Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@penghuo penghuo force-pushed the backport-3095-to-2.x branch from b101b6a to 7ef1071 Compare October 25, 2024 01:59
@penghuo penghuo changed the title [Backport] Array values are preserved (#1300) (#3095) [Backport 2.x] Array values are preserved (#1300) (#3095) Oct 25, 2024
@penghuo
Copy link
Collaborator Author

penghuo commented Oct 25, 2024

Upload Artifacts failed, ready to merge.

@penghuo penghuo self-assigned this Oct 25, 2024
@penghuo penghuo merged commit 81577df into opensearch-project:2.x Oct 25, 2024
22 of 26 checks passed
@penghuo penghuo deleted the backport-3095-to-2.x branch October 25, 2024 03:10
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.15 failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/sql/backport-2.15 2.15
# Navigate to the new working tree
pushd ../.worktrees/sql/backport-2.15
# Create a new branch
git switch --create backport/backport-3120-to-2.15
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 81577dfc8035a1baf0751e87e3ac98736021c5dd
# Push it to GitHub
git push --set-upstream origin backport/backport-3120-to-2.15
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/sql/backport-2.15

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

noCharger pushed a commit to noCharger/sql that referenced this pull request Oct 25, 2024
…ect#3095) (opensearch-project#3120)

Signed-off-by: Norman Jordan <[email protected]>
(cherry picked from commit e109417)

Co-authored-by: normanj-bitquill <[email protected]>
noCharger pushed a commit to noCharger/sql that referenced this pull request Oct 25, 2024
…ect#3095) (opensearch-project#3120)

Signed-off-by: Norman Jordan <[email protected]>
(cherry picked from commit e109417)

Co-authored-by: normanj-bitquill <[email protected]>
Signed-off-by: Louis Chu <[email protected]>
noCharger pushed a commit to noCharger/sql that referenced this pull request Oct 26, 2024
…ect#3095) (opensearch-project#3120)

Signed-off-by: Norman Jordan <[email protected]>
(cherry picked from commit e109417)

Co-authored-by: normanj-bitquill <[email protected]>
Signed-off-by: Louis Chu <[email protected]>
noCharger pushed a commit to noCharger/sql that referenced this pull request Oct 26, 2024
…ect#3095) (opensearch-project#3120)

Signed-off-by: Norman Jordan <[email protected]>
(cherry picked from commit e109417)

Co-authored-by: normanj-bitquill <[email protected]>
Signed-off-by: Louis Chu <[email protected]>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 30, 2024
Signed-off-by: Norman Jordan <[email protected]>
(cherry picked from commit e109417)

Co-authored-by: normanj-bitquill <[email protected]>
(cherry picked from commit 81577df)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
penghuo pushed a commit that referenced this pull request Oct 30, 2024
(cherry picked from commit e109417)


(cherry picked from commit 81577df)

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: normanj-bitquill <[email protected]>
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