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.

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

Replace internal usages of 'master' term in 'server/src/internalClusterTest' directory #2521

Merged
merged 15 commits into from
May 19, 2022
Merged

Replace internal usages of 'master' term in 'server/src/internalClusterTest' directory #2521

merged 15 commits into from
May 19, 2022

Commits on Mar 19, 2022

  1. Replace internal usages of 'master' terminology in server/src/interna… 

    …lClusterTest directory

Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed Mar 19, 2022
    Configuration menu
    Copy the full SHA
    66deace View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2022

  1. Merge branch 'main' into replace-master-int-server-internalclustertest 

    Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed Apr 4, 2022
    Configuration menu
    Copy the full SHA
    370fa9a View commit details
    Browse the repository at this point in the history

Commits on May 9, 2022

  1. Merge branch 'main' into replace-master-int-server-internalclustertest 

    Signed-off-by: Tianli Feng <[email protected]>

# Conflicts:
#	server/src/internalClusterTest/java/org/opensearch/discovery/DiscoveryDisruptionIT.java
    Tianli Feng committed May 9, 2022
    Configuration menu
    Copy the full SHA
    1701c53 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2022

  1. Merge branch 'main' into replace-master-int-server-internalclustertest 

    Signed-off-by: Tianli Feng <[email protected]>

# Conflicts:
#	server/src/internalClusterTest/java/org/opensearch/action/admin/ClientTimeoutIT.java
#	server/src/internalClusterTest/java/org/opensearch/action/admin/cluster/state/TransportClusterStateActionDisruptionIT.java
#	server/src/internalClusterTest/java/org/opensearch/cluster/coordination/UnsafeBootstrapAndDetachCommandIT.java
#	server/src/internalClusterTest/java/org/opensearch/cluster/coordination/ZenDiscoveryIT.java
#	server/src/internalClusterTest/java/org/opensearch/cluster/routing/AllocationIdIT.java
#	server/src/internalClusterTest/java/org/opensearch/discovery/ClusterDisruptionIT.java
#	server/src/internalClusterTest/java/org/opensearch/discovery/DiscoveryDisruptionIT.java
#	server/src/internalClusterTest/java/org/opensearch/env/NodeRepurposeCommandIT.java
#	server/src/internalClusterTest/java/org/opensearch/snapshots/CloneSnapshotIT.java
#	server/src/internalClusterTest/java/org/opensearch/snapshots/ConcurrentSnapshotsIT.java
#	server/src/internalClusterTest/java/org/opensearch/snapshots/DedicatedClusterSnapshotRestoreIT.java
    Tianli Feng committed May 13, 2022
    Configuration menu
    Copy the full SHA
    f69155f View commit details
    Browse the repository at this point in the history

  2. Replace 'master' terminology with 'cluster manager' in server/src/int… 

    …ernalClusterTest directory

Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 13, 2022
    Configuration menu
    Copy the full SHA
    8cb690c View commit details
    Browse the repository at this point in the history

Commits on May 14, 2022

  1. Replace 'master' terminology with 'cluster manager' in server/src/int… 

    …ernalClusterTest directory

Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 14, 2022
    Configuration menu
    Copy the full SHA
    fd5ad03 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2022

  1. Resolve compile error 

    Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 15, 2022
    Configuration menu
    Copy the full SHA
    d41b1ed View commit details
    Browse the repository at this point in the history

  2. Replace 'master' terminology with 'cluster manager' in server/src/int… 

    …ernalClusterTest directory

Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 15, 2022
    Configuration menu
    Copy the full SHA
    f5fde30 View commit details
    Browse the repository at this point in the history

  3. Adjust comment line break 

    Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 15, 2022
    Configuration menu
    Copy the full SHA
    05ef18c View commit details
    Browse the repository at this point in the history

Commits on May 17, 2022

  1. Replace master with cluster_manager in server/src/internalClusterTest 

    Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 17, 2022
    Configuration menu
    Copy the full SHA
    9fbc35f View commit details
    Browse the repository at this point in the history

Commits on May 18, 2022

  1. Merge remote-tracking branch 'upstream/main' into replace-master-int-… 

    …server-internalclustertest

Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 18, 2022
    Configuration menu
    Copy the full SHA
    6b4773f View commit details
    Browse the repository at this point in the history

  2. Replace master with cluster_manager in test method names in server/sr… 

    …c/internalClusterTest

Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 18, 2022
    Configuration menu
    Copy the full SHA
    02af408 View commit details
    Browse the repository at this point in the history

  3. Replace master with cluster_manager in server/src/internalClusterTest 

    Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 18, 2022
    Configuration menu
    Copy the full SHA
    87d07e5 View commit details
    Browse the repository at this point in the history

  4. Replace master with cluster_manager in ConcurrentSnapshotsIT in serve… 

    …r/src/internalClusterTest

Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 18, 2022
    Configuration menu
    Copy the full SHA
    22d2c3e View commit details
    Browse the repository at this point in the history

  5. Replace master with cluster_manager in server/src/internalClusterTest 

    Signed-off-by: Tianli Feng <[email protected]>
    Tianli Feng committed May 18, 2022
    Configuration menu
    Copy the full SHA
    2176adf View commit details
    Browse the repository at this point in the history