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

Fix protocol detection from https system property #61

Merged
merged 1 commit into from
Sep 15, 2023

Conversation

reta
Copy link
Collaborator

@reta reta commented Sep 15, 2023

Description

Fix protocol detection from https system property

Issues Resolved

Closes #60

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.

@andrross andrross merged commit 2cfae7d into opensearch-project:main Sep 15, 2023
5 checks passed
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

reta added a commit to reta/custom-codecs that referenced this pull request Sep 15, 2023
reta added a commit to reta/custom-codecs that referenced this pull request Sep 15, 2023
reta added a commit to reta/custom-codecs that referenced this pull request Sep 15, 2023
reta added a commit that referenced this pull request Sep 15, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 2cfae7d)
reta added a commit that referenced this pull request Sep 15, 2023
Signed-off-by: Andriy Redko <[email protected]>
(cherry picked from commit 2cfae7d)
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.

[AUTOCUT] Integration Test failed for custom-codecs: 2.10.0 tar distribution
2 participants