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

Replace internal usages of 'master' term in 'client' directory #3088

Merged
merged 2 commits into from
Apr 27, 2022

Conversation

tlfeng
Copy link
Collaborator

@tlfeng tlfeng commented Apr 27, 2022

Description

  • Replace the non-inclusive terminology "master" with "cluster manager" in code comments, internal variable and method names, in client directory.
  • Backwards compatibility is not impacted.

Replacement rules:

  • master -> cluster_manager or clusterManager (variable name) or cluster-manager (code comment)
  • Master -> ClusterManager

Issues Resolved

A part of #1548

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

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.

Tianli Feng added 2 commits April 26, 2022 21:29
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng requested review from a team and reta as code owners April 27, 2022 06:20
@tlfeng tlfeng added v2.1.0 Issues and PRs related to version 2.1.0 backport 2.x Backport to 2.x branch labels Apr 27, 2022
@opensearch-ci-bot
Copy link
Collaborator

✅   Gradle Check success 3bc8043
Log 4824

Reports 4824

@dblock dblock merged commit dd7add2 into opensearch-project:main Apr 27, 2022
@opensearch-trigger-bot
Copy link
Contributor

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

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

@tlfeng tlfeng deleted the replace-master-int-client branch April 27, 2022 16:11
tlfeng pushed a commit to tlfeng/OpenSearch that referenced this pull request May 11, 2022
…earch-project#3088)

* Replace internal usages of 'master' term in 'client' directory

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Add a uni test for NodeSelector to test deprecated master role

Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng
Copy link
Collaborator Author

tlfeng commented May 11, 2022

Created PR #3284 to backport the change to 2.x branch.

dblock pushed a commit that referenced this pull request May 11, 2022
#3284)

* Replace internal usages of 'master' term in 'client' directory

Signed-off-by: Tianli Feng <ftianli@amazon.com>

* Add a uni test for NodeSelector to test deprecated master role

Signed-off-by: Tianli Feng <ftianli@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x Backport to 2.x branch v2.1.0 Issues and PRs related to version 2.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants