diff options
| author | Devtools Arcadia <arcadia-devtools@yandex-team.ru> | 2022-02-07 18:08:42 +0300 |
|---|---|---|
| committer | Devtools Arcadia <arcadia-devtools@mous.vla.yp-c.yandex.net> | 2022-02-07 18:08:42 +0300 |
| commit | 1110808a9d39d4b808aef724c861a2e1a38d2a69 (patch) | |
| tree | e26c9fed0de5d9873cce7e00bc214573dc2195b7 /library/cpp/protobuf/util/proto | |
| download | ydb-1110808a9d39d4b808aef724c861a2e1a38d2a69.tar.gz | |
intermediate changes
ref:cde9a383711a11544ce7e107a78147fb96cc4029
Diffstat (limited to 'library/cpp/protobuf/util/proto')
| -rw-r--r-- | library/cpp/protobuf/util/proto/merge.proto | 11 | ||||
| -rw-r--r-- | library/cpp/protobuf/util/proto/ya.make | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/library/cpp/protobuf/util/proto/merge.proto b/library/cpp/protobuf/util/proto/merge.proto new file mode 100644 index 0000000000..a937041c07 --- /dev/null +++ b/library/cpp/protobuf/util/proto/merge.proto @@ -0,0 +1,11 @@ +import "google/protobuf/descriptor.proto"; + +// These meta-options are used for selecting proper merging method, see merge.h + +extend google.protobuf.MessageOptions { + optional bool DontMerge = 54287; +} + +extend google.protobuf.FieldOptions { + optional bool DontMergeField = 54288; +} diff --git a/library/cpp/protobuf/util/proto/ya.make b/library/cpp/protobuf/util/proto/ya.make new file mode 100644 index 0000000000..4d68047d8b --- /dev/null +++ b/library/cpp/protobuf/util/proto/ya.make @@ -0,0 +1,11 @@ +PROTO_LIBRARY() + +OWNER(mowgli) + +SRCS( + merge.proto +) + +EXCLUDE_TAGS(GO_PROTO) + +END() |