diff options
| author |  Julien Boeuf <jboeuf@google.com> | 2016-06-04 18:03:42 -0700 |
|---|---|---|
| committer | Julien Boeuf <jboeuf@google.com> | 2016-06-04 18:03:42 -0700 |
| commit | bfc7ed66286a77ed4dca0ec1feb23912b2ec1f02 (patch) | |
| tree | d731e555910b79b4694b311b1faed78783f688b8 /src/csharp/Grpc.IntegrationTesting/Test.cs | |
| parent | c49464de3ed6108956561128b006c78777bd6db7 (diff) | |
| parent | 845a0567e344d2d85ece37471e63199c045c2249 (diff) | |
Merge branch 'master' into fix_3803
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/Test.cs')
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/Test.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/Test.cs b/src/csharp/Grpc.IntegrationTesting/Test.cs index 363f6444ec..9258dc185d 100644 --- a/src/csharp/Grpc.IntegrationTesting/Test.cs +++ b/src/csharp/Grpc.IntegrationTesting/Test.cs @@ -46,7 +46,7 @@ namespace Grpc.Testing { "cnBjLnRlc3RpbmcuUmVjb25uZWN0SW5mb2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Grpc.Testing.EmptyReflection.Descriptor, global::Grpc.Testing.MessagesReflection.Descriptor, }, - new pbr::GeneratedCodeInfo(null, null)); + new pbr::GeneratedClrTypeInfo(null, null)); } #endregion |