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

chore: migrate default branch to main #264

Merged
merged 6 commits into from
Aug 30, 2021
Merged

chore: migrate default branch to main #264

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
87cdd14
chore: migrate default branch to main
tseaver Aug 26, 2021
ce87b0d
chore: conver 'master' in links to googleapis repo
tseaver Aug 26, 2021
03b62f8
Merge branch 'main' into migrate-master-to-main
tseaver Aug 30, 2021
834c5a0
chore: continue to use 'master' for googleapis repo refs
tseaver Aug 30, 2021
312d13a
chore: fix ReST markup to appease docfx
tseaver Aug 30, 2021
cf8eb63
chore: skip running 'docfx' session except when explicitly required
tseaver Aug 30, 2021
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
3 changes: 1 addition & 2 deletions google/api_core/exceptions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,7 @@ class Cancelled(ClientError):
"""Exception mapping a :attr:`grpc.StatusCode.CANCELLED` error."""

# This maps to HTTP status code 499. See
# https://github.com/googleapis/googleapis/blob/master/google/rpc\
# /code.proto
# https://github.com/googleapis/googleapis/blob/main/google/rpc/code.proto
tseaver marked this conversation as resolved.
Show resolved Hide resolved
code = 499
grpc_status_code = grpc.StatusCode.CANCELLED if grpc is not None else None

Expand Down
2 changes: 1 addition & 1 deletion google/api_core/operations_v1/operations_async_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
https://cloud.google.com/apis/design/design_pattern
s#long_running_operations
.. _google/longrunning/operations.proto:
https://github.com/googleapis/googleapis/blob/master/google/longrunning
https://github.com/googleapis/googleapis/blob/main/google/longrunning
/operations.proto
"""

Expand Down
2 changes: 1 addition & 1 deletion google/api_core/operations_v1/operations_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
https://cloud.google.com/apis/design/design_pattern
s#long_running_operations
.. _google/longrunning/operations.proto:
https://github.com/googleapis/googleapis/blob/master/google/longrunning
https://github.com/googleapis/googleapis/blob/main/google/longrunning
/operations.proto
"""

Expand Down