diff options
| author |  Adam Cozzette <acozzette@google.com> | 2016-11-17 17:04:30 -0800 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-11-17 17:04:30 -0800 |
| commit | 5d63097fc2b7f405f53d6ca4ad3c1ebd98d80ddd (patch) | |
| tree | 50d8116271f024e16334785464c794da85f3ce12 /conformance | |
| parent | 5a76e633ea9b5adb215e93fdc11e1c0c08b3fc74 (diff) | |
| parent | cd315dcbadc02569e145bde16e3f66c2fbb08e31 (diff) | |
Merge branch 'master' into down-integrate-with-msvc-fix
Diffstat (limited to 'conformance')
| -rw-r--r-- | conformance/failure_list_csharp.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conformance/failure_list_csharp.txt b/conformance/failure_list_csharp.txt index dfafbecc..a43519cd 100644 --- a/conformance/failure_list_csharp.txt +++ b/conformance/failure_list_csharp.txt @@ -1,6 +1,6 @@ Recommended.JsonInput.FieldNameWithDoubleUnderscores.JsonOutput +Recommended.JsonInput.FieldNameWithDoubleUnderscores.ProtobufOutput +Recommended.JsonInput.FieldNameWithDoubleUnderscores.Validator +Required.JsonInput.FieldNameInLowerCamelCase.Validator Required.JsonInput.FieldNameInSnakeCase.JsonOutput -Required.JsonInput.FieldNameWithMixedCases.JsonOutput -Required.JsonInput.FieldNameWithMixedCases.ProtobufOutput -Required.JsonInput.FieldNameWithMixedCases.Validator -Required.JsonInput.OriginalProtoFieldName.JsonOutput +Required.JsonInput.FieldNameInSnakeCase.ProtobufOutput |