Skip to content

Replace internal usages of 'master' term in 'test' directory#3283

Merged
dblock merged 8 commits intoopensearch-project:mainfrom
tlfeng:replace-master-int-test
May 11, 2022
Merged

Replace internal usages of 'master' term in 'test' directory#3283
dblock merged 8 commits intoopensearch-project:mainfrom
tlfeng:replace-master-int-test

Conversation

@tlfeng
Copy link
Copy Markdown
Contributor

@tlfeng tlfeng commented May 11, 2022

Description

  • Replace the non-inclusive terminology "master" with "cluster manager" in code comments, internal variable/method/class names, in test 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 8 commits March 19, 2022 02:09
…lClusterTest directory

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

# Conflicts:
#	server/src/internalClusterTest/java/org/opensearch/discovery/DiscoveryDisruptionIT.java
Signed-off-by: Tianli Feng <ftianli@amazon.com>
…ernalClusterTest directory

Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
Signed-off-by: Tianli Feng <ftianli@amazon.com>
@tlfeng tlfeng added v2.1.0 Issues and PRs related to version 2.1.0 backport 2.x Backport to 2.x branch labels May 11, 2022
@tlfeng tlfeng requested review from a team and reta as code owners May 11, 2022 04:14
@opensearch-ci-bot
Copy link
Copy Markdown
Collaborator

✅   Gradle Check success 8d602f0
Log 5226

Reports 5226

Copy link
Copy Markdown
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YOLO

@dblock dblock merged commit 10bff0c into opensearch-project:main May 11, 2022
opensearch-trigger-bot bot pushed a commit that referenced this pull request May 11, 2022
* Replace internal usages of 'master' terminology in server/src/internalClusterTest directory

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

* Replace 'master' terminology with 'cluster manager' in test directory

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

* Replace 'master' terminology with 'cluster manager' in server/src/internalClusterTest directory

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

* Adjust format by spotlessApply task

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

* Replace 'master' terminology with 'cluster manager' in test directory

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

* Adjust format by spotlessApply task

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit 10bff0c)
@tlfeng
Copy link
Copy Markdown
Contributor Author

tlfeng commented May 11, 2022

@dblock Thank you so much for taking your much time in reviewing my massive changes! 💐

@tlfeng tlfeng deleted the replace-master-int-test branch May 11, 2022 23:56
reta pushed a commit that referenced this pull request May 12, 2022
…3293)

* Replace internal usages of 'master' terminology in server/src/internalClusterTest directory

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

* Replace 'master' terminology with 'cluster manager' in test directory

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

* Replace 'master' terminology with 'cluster manager' in server/src/internalClusterTest directory

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

* Adjust format by spotlessApply task

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

* Replace 'master' terminology with 'cluster manager' in test directory

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

* Adjust format by spotlessApply task

Signed-off-by: Tianli Feng <ftianli@amazon.com>
(cherry picked from commit 10bff0c)

Co-authored-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