diff options
| author |  Mark D. Roth <roth@google.com> | 2018-10-15 13:12:26 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2018-10-15 13:12:26 -0700 |
| commit | f4e65787b6a28345162811a7f1d1caafcf289a33 (patch) | |
| tree | 74e3b66283d3592273c2fc7f5d07dd6615cdb374 /src/proto | |
| parent | 0b085a1f05813f54d4164c95fe9431c11f416af3 (diff) | |
| parent | 945b6dbf7b14dc849c4cf377f52d27e635a971aa (diff) | |
Merge remote-tracking branch 'upstream/master' into health_checking_service
Diffstat (limited to 'src/proto')
| -rw-r--r-- | src/proto/grpc/health/v1/BUILD | 8 | ||||
| -rw-r--r-- | src/proto/grpc/testing/control.proto | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/proto/grpc/health/v1/BUILD b/src/proto/grpc/health/v1/BUILD index d234842883..97642985c9 100644 --- a/src/proto/grpc/health/v1/BUILD +++ b/src/proto/grpc/health/v1/BUILD @@ -22,3 +22,11 @@ grpc_proto_library( name = "health_proto", srcs = ["health.proto"], ) + +filegroup( + name = "health_proto_file", + srcs = [ + "health.proto", + ], +) + diff --git a/src/proto/grpc/testing/control.proto b/src/proto/grpc/testing/control.proto index a4a9c8fe57..4cfdc2cafb 100644 --- a/src/proto/grpc/testing/control.proto +++ b/src/proto/grpc/testing/control.proto @@ -25,6 +25,7 @@ enum ClientType { SYNC_CLIENT = 0; ASYNC_CLIENT = 1; OTHER_CLIENT = 2; // used for some language-specific variants + CALLBACK_CLIENT = 3; } enum ServerType { |