diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-27 12:02:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-27 12:02:25 -0400 |
| commit | 87f892e5b56c2fab2f394f8cc79794ccce03f510 (patch) | |
| tree | 1ba831a9dddfb6927698bcb9e0c2bee913ad0dcb /vendor/google.golang.org/grpc/balancer | |
| parent | c57b5c9b831695f8c54d11b4f288d6037c096fea (diff) | |
| parent | 983cfb90e68d7b292b0f6ee8800c3f23383493cc (diff) | |
| download | podman-87f892e5b56c2fab2f394f8cc79794ccce03f510.tar.gz podman-87f892e5b56c2fab2f394f8cc79794ccce03f510.tar.bz2 podman-87f892e5b56c2fab2f394f8cc79794ccce03f510.zip | |
Merge pull request #15076 from mheon/bump_420_rc2
Bump to v4.2.0-RC2
Diffstat (limited to 'vendor/google.golang.org/grpc/balancer')
| -rw-r--r-- | vendor/google.golang.org/grpc/balancer/balancer.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vendor/google.golang.org/grpc/balancer/balancer.go b/vendor/google.golang.org/grpc/balancer/balancer.go index bcc6f5451..f7a7697ca 100644 --- a/vendor/google.golang.org/grpc/balancer/balancer.go +++ b/vendor/google.golang.org/grpc/balancer/balancer.go @@ -27,6 +27,7 @@ import ( "net" "strings" + "google.golang.org/grpc/channelz" "google.golang.org/grpc/connectivity" "google.golang.org/grpc/credentials" "google.golang.org/grpc/internal" @@ -192,7 +193,7 @@ type BuildOptions struct { // server can ignore this field. Authority string // ChannelzParentID is the parent ClientConn's channelz ID. - ChannelzParentID int64 + ChannelzParentID *channelz.Identifier // CustomUserAgent is the custom user agent set on the parent ClientConn. // The balancer should set the same custom user agent if it creates a // ClientConn. |