Skip to content

Fix link in docker.md referencing About Security in OpenSearch page#2580

Merged
cwillum merged 1 commit intomainfrom
fix#2155-Sec-TOC-docker-link
Feb 2, 2023
Merged

Fix link in docker.md referencing About Security in OpenSearch page#2580
cwillum merged 1 commit intomainfrom
fix#2155-Sec-TOC-docker-link

Conversation

@cwillum
Copy link
Contributor

@cwillum cwillum commented Feb 2, 2023

Signed-off-by: cwillum cwmmoore@amazon.com

Description

Extraneous text from a merge conflict made it into the "About Security in OpenSearch" link at the bottom of the docker.md file in Installation.

Issues Resolved

Fixed link.

Checklist

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

Signed-off-by: cwillum <cwmmoore@amazon.com>
@cwillum cwillum added backport 1.3 PR: Backport label for v1.3.x backport 2.0 PR: Backport label for v2.0.x security Doc review PR: Doc review in progress backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2 backport 2.3 PR: Backport label for 2.3 backport 2.4 PR: Backport label for 2.4 backport 2.5 PR: Backport label for 2.5 labels Feb 2, 2023
@cwillum cwillum self-assigned this Feb 2, 2023
@cwillum cwillum requested a review from a team as a code owner February 2, 2023 19:56
@cwillum cwillum changed the title Fix link in docker.md referencing About Security for OpenSearch page Fix link in docker.md referencing About Security in OpenSearch page Feb 2, 2023
@cwillum cwillum merged commit 24cf6fd into main Feb 2, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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-2580-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 24cf6fd66ebef7c144f9c626f894f4aafbac0e50
# Push it to GitHub
git push --set-upstream origin backport/backport-2580-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-2580-to-2.3.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 2, 2023
Signed-off-by: cwillum <cwmmoore@amazon.com>
(cherry picked from commit 24cf6fd)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 2, 2023
Signed-off-by: cwillum <cwmmoore@amazon.com>
(cherry picked from commit 24cf6fd)
Naarcha-AWS pushed a commit that referenced this pull request Feb 2, 2023
Signed-off-by: cwillum <cwmmoore@amazon.com>
(cherry picked from commit 24cf6fd)

Co-authored-by: Chris Moore <107723039+cwillum@users.noreply.github.com>
Naarcha-AWS pushed a commit that referenced this pull request Feb 2, 2023
Signed-off-by: cwillum <cwmmoore@amazon.com>
(cherry picked from commit 24cf6fd)

Co-authored-by: Chris Moore <107723039+cwillum@users.noreply.github.com>
Naarcha-AWS pushed a commit that referenced this pull request Feb 2, 2023
Signed-off-by: cwillum <cwmmoore@amazon.com>
@cwillum cwillum removed the backport 1.3 PR: Backport label for v1.3.x label Feb 6, 2023
@cwillum cwillum added backport 1.3 PR: Backport label for v1.3.x backport 2.0 PR: Backport label for v2.0.x backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2 backport 2.3 PR: Backport label for 2.3 and removed backport 2.0 PR: Backport label for v2.0.x backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2 backport 2.3 PR: Backport label for 2.3 labels Feb 6, 2023
@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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-2580-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 24cf6fd66ebef7c144f9c626f894f4aafbac0e50
# Push it to GitHub
git push --set-upstream origin backport/backport-2580-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-2580-to-2.3.

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@opensearch-trigger-bot
Copy link
Contributor

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

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

@hdhalter hdhalter deleted the fix#2155-Sec-TOC-docker-link branch March 28, 2024 21:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport 1.3 PR: Backport label for v1.3.x backport 2.0 PR: Backport label for v2.0.x backport 2.1 PR: Backport label for 2.1 backport 2.2 PR: Backport label for 2.2 backport 2.3 PR: Backport label for 2.3 backport 2.4 PR: Backport label for 2.4 backport 2.5 PR: Backport label for 2.5 Doc review PR: Doc review in progress

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants