diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-10-25 20:22:20 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-10-25 20:22:20 +0000 |
| commit | 1dfaf48b0ecd8da3e673cdece573c5519aeee2e7 (patch) | |
| tree | 5f37643fdd85b726b1c6a224f0ad133da71b6381 /pkg/shim/runtimeoptions/runtimeoptions.go | |
| parent | dcc0a8f024f1a7bbe43c84c499d8f72f779e1428 (diff) | |
| parent | 9262ea47a5d93d44b14f298663982b75ed2e4898 (diff) | |
Merge release-20211019.0-33-g9262ea47a (automated)
Diffstat (limited to 'pkg/shim/runtimeoptions/runtimeoptions.go')
| -rw-r--r-- | pkg/shim/runtimeoptions/runtimeoptions.go | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkg/shim/runtimeoptions/runtimeoptions.go b/pkg/shim/runtimeoptions/runtimeoptions.go index e76d73ea7..c3a3b664f 100644 --- a/pkg/shim/runtimeoptions/runtimeoptions.go +++ b/pkg/shim/runtimeoptions/runtimeoptions.go @@ -13,12 +13,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package runtimeoptions contains the runtimeoptions proto. +// Package runtimeoptions contains the runtimeoptions proto for containerd 1.5 +// and above. 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") -} |