Merge pull request #6415 from ZachEddy:containerd-runtime-options-v1.5

PiperOrigin-RevId: 393411409
This commit is contained in:
gVisor bot
2021-08-27 13:08:21 -07:00
@@ -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")
}