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.

Sign up for GitHub

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

Jump to bottom

Update to Breaking changes file #3550

Merged

hdhalter merged 2 commits into main from fix-to-breaking2

Mar 23, 2023

Contributor

hdhalter commented Mar 23, 2023

Description

Rewords inclusive naming text

Issues Resolved

Further updates based on #1360

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.


          fixtobreaking2

45cdc8d

Signed-off-by: Heather Halter <hdhalter@amazon.com>

hdhalter requested a review from a team as a code owner

March 23, 2023 14:33

hdhalter added 4 - Doc review backport 1.3 backport 2.0 backport 2.1 backport 2.2 backport 2.3 backport 2.4 backport 2.5 backport 2.6 labels

hdhalter self-assigned this

JeffHuss approved these changes

View reviewed changes

JeffHuss left a comment

LGTM other than a recommendation about using active voice.

breaking-changes.md Outdated

    
              In order for OpenSearch to include more inclusive naming conventions, we've replaced the following terms in our code with more inclusive terms:

              Non-inclusive terms have been deprecated in the 2.x releases and will be permanently removed in OpenSearch 3.0.  We are using the following replacements:

JeffHuss Mar 23, 2023 •

edited

Loading

Passive voice ("...have been deprecated.."). Change to something like:

Non-inclusive terms are deprecated in version 2.x and will not be supported in the next major release.

Contributor Author

hdhalter Mar 23, 2023

Thanks, Jeff! A previous consensus was to say 'permanently removed' to express the seriousness of this change. Of course, this will be documented for 3.0 as a breaking change.

cwillum approved these changes

View reviewed changes


          fixpassivevoice

cd4b68a

Signed-off-by: Heather Halter <hdhalter@amazon.com>

hdhalter merged commit ede405c into main

opensearch-trigger-bot bot commented Mar 23, 2023

The backport to 1.3 failed:

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

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
pushd ../.worktrees/backport-1.3
# Create a new branch
git switch --create backport/backport-3550-to-1.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ede405c85dbeda4c4fbc21423e2477c2102640e3
# Push it to GitHub
git push --set-upstream origin backport/backport-3550-to-1.3
# Go back to the original working tree
popd
# 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-3550-to-1.3.

opensearch-trigger-bot bot commented Mar 23, 2023

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
pushd ../.worktrees/backport-2.0
# Create a new branch
git switch --create backport/backport-3550-to-2.0
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ede405c85dbeda4c4fbc21423e2477c2102640e3
# Push it to GitHub
git push --set-upstream origin backport/backport-3550-to-2.0
# Go back to the original working tree
popd
# 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-3550-to-2.0.

opensearch-trigger-bot bot commented Mar 23, 2023

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
pushd ../.worktrees/backport-2.1
# Create a new branch
git switch --create backport/backport-3550-to-2.1
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ede405c85dbeda4c4fbc21423e2477c2102640e3
# Push it to GitHub
git push --set-upstream origin backport/backport-3550-to-2.1
# Go back to the original working tree
popd
# 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-3550-to-2.1.

opensearch-trigger-bot bot commented Mar 23, 2023

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
pushd ../.worktrees/backport-2.2
# Create a new branch
git switch --create backport/backport-3550-to-2.2
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ede405c85dbeda4c4fbc21423e2477c2102640e3
# Push it to GitHub
git push --set-upstream origin backport/backport-3550-to-2.2
# Go back to the original working tree
popd
# 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-3550-to-2.2.

opensearch-trigger-bot bot commented Mar 23, 2023

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
pushd ../.worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-3550-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ede405c85dbeda4c4fbc21423e2477c2102640e3
# Push it to GitHub
git push --set-upstream origin backport/backport-3550-to-2.3
# Go back to the original working tree
popd
# 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-3550-to-2.3.

opensearch-trigger-bot bot commented Mar 23, 2023

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

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

opensearch-trigger-bot bot commented Mar 23, 2023

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

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

opensearch-trigger-bot bot commented Mar 23, 2023

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

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

vagimeli pushed a commit that referenced this pull request


          Update to Breaking changes file (#3550)

c8e296e

* fixtobreaking2

Signed-off-by: Heather Halter <hdhalter@amazon.com>

* fixpassivevoice

Signed-off-by: Heather Halter <hdhalter@amazon.com>

---------

Signed-off-by: Heather Halter <hdhalter@amazon.com>

vagimeli added a commit that referenced this pull request


          Revert "Update to Breaking changes file (#3550)"

0167fed

This reverts commit c8e296e.

harshavamsi pushed a commit to harshavamsi/documentation-website that referenced this pull request


          Update to Breaking changes file (opensearch-project#3550)

c59abae

* fixtobreaking2

Signed-off-by: Heather Halter <hdhalter@amazon.com>

* fixpassivevoice

Signed-off-by: Heather Halter <hdhalter@amazon.com>

---------

Signed-off-by: Heather Halter <hdhalter@amazon.com>

hdhalter deleted the fix-to-breaking2 branch

March 28, 2024 21:20

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

Labels

4 - Doc review backport 1.3 backport 2.0 backport 2.1 backport 2.2 backport 2.3 backport 2.4 backport 2.5 backport 2.6