diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-08-27 20:15:43 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-08-27 20:15:43 +0000 |
| commit | 8416dca58aa8e1c9ab0ed5dfd4a3cdf8bd9ffef6 (patch) | |
| tree | 604c76c1e6120c2ab34825688e4600f8b9204b78 /pkg/shim/runtimeoptions | |
| parent | 271ed35bb06d0af7745f116630d986a02183c79d (diff) | |
| parent | 0db19ea910def9848d0f53f65f993270ed579a8f (diff) | |
Merge release-20210816.0-51-g0db19ea91 (automated)
Diffstat (limited to 'pkg/shim/runtimeoptions')
| -rw-r--r-- | pkg/shim/runtimeoptions/runtimeoptions.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/shim/runtimeoptions/runtimeoptions.go b/pkg/shim/runtimeoptions/runtimeoptions.go index 072dd87f0..e76d73ea7 100644 --- a/pkg/shim/runtimeoptions/runtimeoptions.go +++ b/pkg/shim/runtimeoptions/runtimeoptions.go @@ -15,3 +15,10 @@ // Package runtimeoptions contains the runtimeoptions proto. package runtimeoptions + +import proto "github.com/gogo/protobuf/proto" + +func init() { + // TODO(gvisor.dev/issue/6449): Upgrade runtimeoptions.proto after upgrading to containerd 1.5 + proto.RegisterType((*Options)(nil), "runtimeoptions.v1.Options") +} |