-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
[2.x] Deprecate public methods and variables that contain 'master' terminology in 'client' directory (#3966) #3981
[2.x] Deprecate public methods and variables that contain 'master' terminology in 'client' directory (#3966) #3981
Conversation
Codecov Report
@@ Coverage Diff @@
## 2.x #3981 +/- ##
============================================
+ Coverage 70.55% 70.64% +0.09%
- Complexity 56382 56445 +63
============================================
Files 4526 4526
Lines 271760 271785 +25
Branches 39978 39980 +2
============================================
+ Hits 191733 192011 +278
+ Misses 63869 63644 -225
+ Partials 16158 16130 -28
Help us with your feedback. Take ten seconds to tell us how you rate us. |
Gradle Check (Jenkins) Run Completed with:
|
…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]>
dfc20c5
to
d2fe0ef
Compare
Gradle Check (Jenkins) Run Completed with:
|
In build 932, the test failure is reported in issue #3579 |
Gradle Check (Jenkins) Run Completed with:
|
In log 933, the same failure as above. |
Gradle Check (Jenkins) Run Completed with:
|
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-3981-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 257e3b8de96533b838ebf4d0c77b2bc1bf9d2ab1
# Push it to GitHub
git push --set-upstream origin backport/backport-3981-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 |
Description
Backport PR #3966 / commit ccf1d15 to
2.x
branchIssues Resolved
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
The method
Params withMasterTimeout(TimeValue masterTimeout)
remains not changed, becausemaster_timeout
parameter of the REST APIs is not deprecated in version2.x
OpenSearch/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
Line 894 in 79cabaf
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.