diff options
author | Adam Cozzette <acozzette@gmail.com> | 2018-03-20 16:14:32 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-20 16:14:32 -0700 |
commit | ed4321d1cb33199984118d801956822842771e7e (patch) | |
tree | 16c54ef8d5409766c18ccae8fca685230680d620 /csharp | |
parent | e436ee0aa179340832281b7d90885e9ff15b3748 (diff) | |
parent | 11d26ce24c90a6cf2544f71e09970513550ef6c6 (diff) | |
download | protobuf-ed4321d1cb33199984118d801956822842771e7e.tar.gz protobuf-ed4321d1cb33199984118d801956822842771e7e.tar.bz2 protobuf-ed4321d1cb33199984118d801956822842771e7e.zip |
Merge pull request #4387 from acozzette/down-integrate
Integrated internal changes from Google
Diffstat (limited to 'csharp')
-rw-r--r-- | csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs index 3565f433..b73930b2 100644 --- a/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs +++ b/csharp/src/Google.Protobuf/WellKnownTypes/FieldMask.cs @@ -244,8 +244,8 @@ namespace Google.Protobuf.WellKnownTypes { /// /// ## Field Mask Verification /// - /// The implementation of the all the API methods, which have any FieldMask type - /// field in the request, should verify the included field paths, and return + /// The implementation of any API method which has a FieldMask type field in the + /// request should verify the included field paths, and return an /// `INVALID_ARGUMENT` error if any path is duplicated or unmappable. /// </summary> public sealed partial class FieldMask : pb::IMessage<FieldMask> { |