diff options
| author |  Bo Yang <paulyang1211@gmail.com> | 2017-08-05 10:42:29 -0700 |
|---|---|---|
| committer | Bo Yang <paulyang1211@gmail.com> | 2017-08-05 10:42:29 -0700 |
| commit | 8f4b8e430a0cf087af423be434cf8d837027c651 (patch) | |
| tree | a7a79a2ff33b31b9036eb378eb458928a0648481 /conformance/conformance.proto | |
| parent | c2f69d6fa23a815948368fae0b8c1e56e50715c9 (diff) | |
| parent | f14703c933d04a4aac285c482bf828269bd0a151 (diff) | |
Merge branch 'master' into 3.4.x
Diffstat (limited to 'conformance/conformance.proto')
| -rw-r--r-- | conformance/conformance.proto | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/conformance/conformance.proto b/conformance/conformance.proto index 10e5d34e..525140e9 100644 --- a/conformance/conformance.proto +++ b/conformance/conformance.proto @@ -78,7 +78,9 @@ message ConformanceRequest { // Which format should the testee serialize its message to? WireFormat requested_output_format = 3; - // should be set to either "proto2" or "proto3" + // The full name for the test message to use; for the moment, either: + // protobuf_test_messages.proto3.TestAllTypesProto3 or + // protobuf_test_messages.proto2.TestAllTypesProto2. string message_type = 4; } |