diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-19 23:37:18 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-19 23:37:18 +0000 |
| commit | 6eeaa4f0d10ddc431aaf2568aa66fa5eb22fd538 (patch) | |
| tree | 5a54fc69231f789d0f7aa9e63db60a149fc02beb /pkg/shim/v2/runtimeoptions/runtimeoptions.go | |
| parent | 7f5dd4f20148bbd6400046567f05bdf014e10d5c (diff) | |
| parent | 54e989ec3a2d9c6928047ea09a3d6053cbf2441f (diff) | |
Merge release-20201005.0-102-g54e989ec3 (automated)
Diffstat (limited to 'pkg/shim/v2/runtimeoptions/runtimeoptions.go')
| -rw-r--r-- | pkg/shim/v2/runtimeoptions/runtimeoptions.go | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pkg/shim/v2/runtimeoptions/runtimeoptions.go b/pkg/shim/v2/runtimeoptions/runtimeoptions.go index aaf17b87a..072dd87f0 100644 --- a/pkg/shim/v2/runtimeoptions/runtimeoptions.go +++ b/pkg/shim/v2/runtimeoptions/runtimeoptions.go @@ -13,18 +13,5 @@ // See the License for the specific language governing permissions and // limitations under the License. +// Package runtimeoptions contains the runtimeoptions proto. package runtimeoptions - -import ( - proto "github.com/gogo/protobuf/proto" - pb "gvisor.dev/gvisor/pkg/shim/v2/runtimeoptions/api_go_proto" -) - -type Options = pb.Options - -func init() { - // The generated proto file auto registers with "golang/protobuf/proto" - // package. However, typeurl uses "golang/gogo/protobuf/proto". So registers - // the type there too. - proto.RegisterType((*Options)(nil), "cri.runtimeoptions.v1.Options") -} |