-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
Deprecate public methods and variables that contain 'master' terminology in 'client' directory #3966
Merged
tlfeng
merged 2 commits into
opensearch-project:main
from
tlfeng:deprecate-master-method-client
Jul 22, 2022
Merged
Deprecate public methods and variables that contain 'master' terminology in 'client' directory #3966
tlfeng
merged 2 commits into
opensearch-project:main
from
tlfeng:deprecate-master-method-client
Jul 22, 2022
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ogy in 'client' directory Signed-off-by: Tianli Feng <[email protected]>
tlfeng
added
backport
PRs or issues specific to backporting features or enhancments
v3.0.0
Issues and PRs related to version 3.0.0
backport 2.x
Backport to 2.x branch
v2.2.0
enhancement
Enhancement or improvement to existing feature or request
deprecate
labels
Jul 21, 2022
Gradle Check (Jenkins) Run Completed with:
|
Gradle Check (Jenkins) Run Completed with:
|
Rishikesh1159
approved these changes
Jul 21, 2022
@Rishikesh1159 Thank you so much for your review! 👍 |
Signed-off-by: Tianli Feng <[email protected]>
The backport to
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-3966-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ccf1d15618770acd54be9b3f37e731612a42e2d6
# Push it to GitHub
git push --set-upstream origin backport/backport-3966-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 |
5 tasks
tlfeng
pushed a commit
to tlfeng/OpenSearch
that referenced
this pull request
Jul 22, 2022
…ogy in 'client' directory (opensearch-project#3966) * Deprecate public methods and variables that contain 'master' terminology in 'client' directory Signed-off-by: Tianli Feng <[email protected]> * Change 1 String type usages with 'master' to 'cluster manager' Signed-off-by: Tianli Feng <[email protected]>
tlfeng
pushed a commit
that referenced
this pull request
Jul 26, 2022
…ogy in 'client' directory (#3966) (#3981) To support inclusive language, the `master` terminology is going to be replaced by `cluster manager` in the code base. This PR deprecate public and protected methods/variable that contains `master` terminology in the name in client directory, and create alternatives. List of public methods to be renamed in client directory: ``` public void setMasterTimeout(TimeValue clusterManagerTimeout) public TimeValue masterNodeTimeout() public TimeValue getMasterNodeTimeout() public void setMasterNodeTimeout(@nullable TimeValue clusterManagerNodeTimeout) public void setMasterNodeTimeout(String clusterManagerNodeTimeout) public boolean isMasterEligible() ``` List of public variables to be renamed in client directory: ``` public static final TimeValue DEFAULT_MASTER_NODE_TIMEOUT ``` Signed-off-by: Tianli Feng <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
backport
PRs or issues specific to backporting features or enhancments
backport 2.x
Backport to 2.x branch
deprecate
enhancement
Enhancement or improvement to existing feature or request
v2.2.0
v3.0.0
Issues and PRs related to version 3.0.0
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
To support inclusive language, the
master
terminology is going to be replaced bycluster manager
in the code base.This PR deprecate public and protected methods/variable that contains
master
terminology in the name inclient
directory, and create alternatives.List of public methods to be renamed in
client
directory:List of public variables to be renamed in
client
directory:Other changes:
OpenSearch/client/rest/src/main/java/org/opensearch/client/NodeSelector.java
Line 102 in 31f4b7a
OpenSearch/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java
Line 2131 in 31f4b7a
OpenSearch/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java
Line 2114 in 31f4b7a
Issues Resolved
A part of #3544
Check List
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.