Skip to content

Migrating from master and slave terminology #1

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

Open
bopopescu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Migrating from master and slave terminology #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 49 additions & 49 deletions google-cloud-sdk/.install/.backup/data/cli/gcloud_completions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4991,7 +4991,7 @@
"--enable-ip-alias": "bool",
"--enable-kubernetes-alpha": "bool",
"--enable-legacy-authorization": "bool",
"--enable-master-authorized-networks": "bool",
"--enable-main-authorized-networks": "bool",
"--enable-network-policy": "bool",
"--enable-pod-security-policy": "bool",
"--enable-stackdriver-kubernetes": "bool",
Expand All @@ -5004,8 +5004,8 @@
"--local-ssd-volumes": "value",
"--machine-type": "value",
"--maintenance-window": "value",
"--master-authorized-networks": "value",
"--master-ipv4-cidr": "value",
"--main-authorized-networks": "value",
"--main-ipv4-cidr": "value",
"--max-accelerator": "value",
"--max-cpu": "value",
"--max-memory": "value",
Expand Down Expand Up @@ -5097,13 +5097,13 @@
"--enable-autoscaling": "bool",
"--enable-basic-auth": "bool",
"--enable-legacy-authorization": "bool",
"--enable-master-authorized-networks": "bool",
"--enable-main-authorized-networks": "bool",
"--enable-network-policy": "bool",
"--enable-pod-security-policy": "bool",
"--generate-password": "bool",
"--logging-service": "value",
"--maintenance-window": "value",
"--master-authorized-networks": "value",
"--main-authorized-networks": "value",
"--max-accelerator": "value",
"--max-cpu": "value",
"--max-memory": "value",
Expand Down Expand Up @@ -5134,7 +5134,7 @@
"--cluster-version": "value",
"--concurrent-node-count": "value",
"--image-type": "value",
"--master": "bool",
"--main": "bool",
"--node-pool": "value",
"--region": "value",
"--zone": "value"
Expand Down Expand Up @@ -10010,18 +10010,18 @@
"WED"
],
"--maintenance-window-hour": "value",
"--master-ca-certificate-path": "value",
"--master-dump-file-path": "value",
"--master-instance-name": "value",
"--master-password": "value",
"--master-username": "value",
"--main-ca-certificate-path": "value",
"--main-dump-file-path": "value",
"--main-instance-name": "value",
"--main-password": "value",
"--main-username": "value",
"--memory": "value",
"--network": "value",
"--pricing-plan": [
"PACKAGE",
"PER_USE"
],
"--prompt-for-master-password": "bool",
"--prompt-for-main-password": "bool",
"--region": "value",
"--replica-type": [
"FAILOVER",
Expand Down Expand Up @@ -16311,7 +16311,7 @@
"--enable-ip-alias": "bool",
"--enable-kubernetes-alpha": "bool",
"--enable-legacy-authorization": "bool",
"--enable-master-authorized-networks": "bool",
"--enable-main-authorized-networks": "bool",
"--enable-network-policy": "bool",
"--enable-pod-security-policy": "bool",
"--enable-stackdriver-kubernetes": "bool",
Expand All @@ -16322,8 +16322,8 @@
"--local-ssd-count": "value",
"--machine-type": "value",
"--maintenance-window": "value",
"--master-authorized-networks": "value",
"--master-ipv4-cidr": "value",
"--main-authorized-networks": "value",
"--main-ipv4-cidr": "value",
"--max-nodes": "value",
"--max-nodes-per-pool": "value",
"--min-cpu-platform": "value",
Expand Down Expand Up @@ -16408,13 +16408,13 @@
"--enable-autoscaling": "bool",
"--enable-basic-auth": "bool",
"--enable-legacy-authorization": "bool",
"--enable-master-authorized-networks": "bool",
"--enable-main-authorized-networks": "bool",
"--enable-network-policy": "bool",
"--enable-pod-security-policy": "bool",
"--generate-password": "bool",
"--logging-service": "value",
"--maintenance-window": "value",
"--master-authorized-networks": "value",
"--main-authorized-networks": "value",
"--max-nodes": "value",
"--min-nodes": "value",
"--monitoring-service": "value",
Expand All @@ -16438,7 +16438,7 @@
"--async": "bool",
"--cluster-version": "value",
"--image-type": "value",
"--master": "bool",
"--main": "bool",
"--node-pool": "value",
"--region": "value",
"--zone": "value"
Expand Down Expand Up @@ -16775,18 +16775,18 @@
"--initialization-action-timeout": "value",
"--initialization-actions": "value",
"--labels": "value",
"--master-accelerator": "value",
"--master-boot-disk-size": "value",
"--master-boot-disk-type": "value",
"--master-machine-type": "value",
"--master-min-cpu-platform": "value",
"--main-accelerator": "value",
"--main-boot-disk-size": "value",
"--main-boot-disk-type": "value",
"--main-machine-type": "value",
"--main-min-cpu-platform": "value",
"--max-age": "value",
"--max-idle": "value",
"--metadata": "value",
"--network": "value",
"--no-address": "bool",
"--num-master-local-ssds": "value",
"--num-masters": "value",
"--num-main-local-ssds": "value",
"--num-mains": "value",
"--num-preemptible-workers": "value",
"--num-worker-local-ssds": "value",
"--num-workers": "value",
Expand Down Expand Up @@ -17340,18 +17340,18 @@
"--initialization-action-timeout": "value",
"--initialization-actions": "value",
"--labels": "value",
"--master-accelerator": "value",
"--master-boot-disk-size": "value",
"--master-boot-disk-type": "value",
"--master-machine-type": "value",
"--master-min-cpu-platform": "value",
"--main-accelerator": "value",
"--main-boot-disk-size": "value",
"--main-boot-disk-type": "value",
"--main-machine-type": "value",
"--main-min-cpu-platform": "value",
"--max-age": "value",
"--max-idle": "value",
"--metadata": "value",
"--network": "value",
"--no-address": "bool",
"--num-master-local-ssds": "value",
"--num-masters": "value",
"--num-main-local-ssds": "value",
"--num-mains": "value",
"--num-preemptible-workers": "value",
"--num-worker-local-ssds": "value",
"--num-workers": "value",
Expand Down Expand Up @@ -21561,17 +21561,17 @@
"WED"
],
"--maintenance-window-hour": "value",
"--master-ca-certificate-path": "value",
"--master-dump-file-path": "value",
"--master-instance-name": "value",
"--master-password": "value",
"--master-username": "value",
"--main-ca-certificate-path": "value",
"--main-dump-file-path": "value",
"--main-instance-name": "value",
"--main-password": "value",
"--main-username": "value",
"--memory": "value",
"--pricing-plan": [
"PACKAGE",
"PER_USE"
],
"--prompt-for-master-password": "bool",
"--prompt-for-main-password": "bool",
"--region": "value",
"--replica-type": [
"FAILOVER",
Expand Down Expand Up @@ -25570,15 +25570,15 @@
"--enable-ip-alias": "bool",
"--enable-kubernetes-alpha": "bool",
"--enable-legacy-authorization": "bool",
"--enable-master-authorized-networks": "bool",
"--enable-main-authorized-networks": "bool",
"--enable-network-policy": "bool",
"--image-type": "value",
"--issue-client-certificate": "bool",
"--labels": "value",
"--local-ssd-count": "value",
"--machine-type": "value",
"--maintenance-window": "value",
"--master-authorized-networks": "value",
"--main-authorized-networks": "value",
"--max-nodes": "value",
"--max-nodes-per-pool": "value",
"--min-cpu-platform": "value",
Expand Down Expand Up @@ -25655,12 +25655,12 @@
"--enable-autoscaling": "bool",
"--enable-basic-auth": "bool",
"--enable-legacy-authorization": "bool",
"--enable-master-authorized-networks": "bool",
"--enable-main-authorized-networks": "bool",
"--enable-network-policy": "bool",
"--generate-password": "bool",
"--logging-service": "value",
"--maintenance-window": "value",
"--master-authorized-networks": "value",
"--main-authorized-networks": "value",
"--max-nodes": "value",
"--min-nodes": "value",
"--monitoring-service": "value",
Expand All @@ -25684,7 +25684,7 @@
"--async": "bool",
"--cluster-version": "value",
"--image-type": "value",
"--master": "bool",
"--main": "bool",
"--node-pool": "value",
"--region": "value",
"--zone": "value"
Expand Down Expand Up @@ -25948,13 +25948,13 @@
"--initialization-action-timeout": "value",
"--initialization-actions": "value",
"--labels": "value",
"--master-boot-disk-size": "value",
"--master-boot-disk-type": "value",
"--master-machine-type": "value",
"--main-boot-disk-size": "value",
"--main-boot-disk-type": "value",
"--main-machine-type": "value",
"--metadata": "value",
"--network": "value",
"--num-master-local-ssds": "value",
"--num-masters": "value",
"--num-main-local-ssds": "value",
"--num-mains": "value",
"--num-preemptible-workers": "value",
"--num-worker-local-ssds": "value",
"--num-workers": "value",
Expand Down Expand Up @@ -29429,7 +29429,7 @@
"WED"
],
"--maintenance-window-hour": "value",
"--master-instance-name": "value",
"--main-instance-name": "value",
"--memory": "value",
"--pricing-plan": [
"PACKAGE",
Expand Down
10 changes: 5 additions & 5 deletions google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class InvalidRepositoryError(exceptions.Error):
"""Attempted to fetch or clone from a repository missing something basic.

This gets raised if we try to fetch or clone from a repo that is either
missing a HEAD or missing both a "latest" tag and a master branch.
missing a HEAD or missing both a "latest" tag and a main branch.
"""


Expand Down Expand Up @@ -147,7 +147,7 @@ def _PullTags(local_repo, client_wrapper, target_dir):

Returns:
(str, dulwich.objects.Commit) The tag that was actually pulled (we try to
get "latest" but fall back to "master") and the commit object
get "latest" but fall back to "main") and the commit object
associated with it.

Raises:
Expand All @@ -164,7 +164,7 @@ def _PullTags(local_repo, client_wrapper, target_dir):
# Try to get the "latest" tag (latest released version)
revision = None
tag = None
for tag in (b'refs/tags/latest', b'refs/heads/master'):
for tag in (b'refs/tags/latest', b'refs/heads/main'):
try:
log.debug('looking up ref %s', tag)
revision = local_repo[tag]
Expand All @@ -173,7 +173,7 @@ def _PullTags(local_repo, client_wrapper, target_dir):
log.warning('Unable to checkout branch %s', tag)

else:
raise AssertionError('No "refs/heads/master" tag found in repository.')
raise AssertionError('No "refs/heads/main" tag found in repository.')

return tag, revision

Expand Down Expand Up @@ -258,7 +258,7 @@ def InstallRuntimeDef(url, target_dir):
directory. At this time, the runtime definition url must be the URL of a
git repository and we identify the tree to checkout based on 1) the presence
of a "latest" tag ("refs/tags/latest") 2) if there is no "latest" tag, the
head of the "master" branch ("refs/heads/master").
head of the "main" branch ("refs/heads/main").

Args:
url: (str) A URL identifying a git repository. The HTTP, TCP and local
Expand Down
Loading