diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-07-29 17:31:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 17:31:32 +0200 |
| commit | 1ea3686600eada7e24e352359e9b76ece1c0bae2 (patch) | |
| tree | 04bd7464360d0c7cd76ace1cd6f953c1c939cb20 /vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go | |
| parent | 6e86e572439c0cbbeac5be48d19fbc74e6f31d87 (diff) | |
| parent | 49bcb7eaa0f3dd14aee629ac0ce8a4e67b954f00 (diff) | |
| download | podman-1ea3686600eada7e24e352359e9b76ece1c0bae2.tar.gz podman-1ea3686600eada7e24e352359e9b76ece1c0bae2.tar.bz2 podman-1ea3686600eada7e24e352359e9b76ece1c0bae2.zip | |
Merge pull request #15116 from containers/dependabot/go_modules/google.golang.org/protobuf-1.28.1
Bump google.golang.org/protobuf from 1.28.0 to 1.28.1
Diffstat (limited to 'vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go')
| -rw-r--r-- | vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go b/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go index 59f024c44..58352a697 100644 --- a/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go +++ b/vendor/google.golang.org/protobuf/reflect/protoregistry/registry.go @@ -30,9 +30,11 @@ import ( // conflictPolicy configures the policy for handling registration conflicts. // // It can be over-written at compile time with a linker-initialized variable: +// // go build -ldflags "-X google.golang.org/protobuf/reflect/protoregistry.conflictPolicy=warn" // // It can be over-written at program execution with an environment variable: +// // GOLANG_PROTOBUF_REGISTRATION_CONFLICT=warn ./main // // Neither of the above are covered by the compatibility promise and |