diff options
| author | gVisor bot <gvisor-bot@google.com> | 2021-10-05 19:52:40 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-10-05 19:52:40 +0000 |
| commit | 02f7b480cbde8bbdfdf8f2a753d510496b25c156 (patch) | |
| tree | 5e636033928dcc77c2bc1c2c036aa7863aaf4ddd /pkg/sentry/kernel | |
| parent | 73ad66a5af2e9ccb1d3d6d4019da7b1bc6dc232d (diff) | |
| parent | 6f6cf522ec32e7988434586ce1fcbd7f2133dbaa (diff) | |
Merge release-20210927.0-31-g6f6cf522e (automated)
Diffstat (limited to 'pkg/sentry/kernel')
| -rw-r--r-- | pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go | 11 | ||||
| -rw-r--r-- | pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go | 11 |
2 files changed, 6 insertions, 16 deletions
diff --git a/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go b/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go index ed1b8a8ca..e960b9a37 100644 --- a/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go +++ b/pkg/sentry/kernel/memevent/memory_events_go_proto/memory_events.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.27.1 +// protoc v3.17.0 // source: pkg/sentry/kernel/memevent/memory_events.proto -package gvisor +package memory_events_go_proto import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -21,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type MemoryUsageEvent struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go b/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go index 54955f061..f5476fdb1 100644 --- a/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go +++ b/pkg/sentry/kernel/uncaught_signal_go_proto/uncaught_signal.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.27.1 +// protoc v3.17.0 // source: pkg/sentry/kernel/uncaught_signal.proto -package gvisor +package uncaught_signal_go_proto import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" registers_go_proto "gvisor.dev/gvisor/pkg/sentry/arch/registers_go_proto" @@ -22,10 +21,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type UncaughtSignal struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache |