diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-07-15 14:07:18 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-07-15 14:07:18 -0700 |
| commit | e0d581b6ad1023635598d9de95bd951cd04b0354 (patch) | |
| tree | a0601b1315a1dc7b499998a95adba61322825f3c /src/csharp/Grpc.IntegrationTesting/InteropServer.cs | |
| parent | 658b6087cc07f8706d270ee0e31f28bbf732ec3d (diff) | |
| parent | 3e5d61670e23b040ed47b2df1e4c87ee2cfec4aa (diff) | |
Merge branch 'master' of github.com:grpc/grpc into decompression
# Conflicts:
# Makefile
# include/grpc++/client_context.h
# include/grpc++/server_context.h
# src/cpp/client/client_context.cc
# src/cpp/server/server_context.cc
# vsprojects/Grpc.mak
Diffstat (limited to 'src/csharp/Grpc.IntegrationTesting/InteropServer.cs')
| -rw-r--r-- | src/csharp/Grpc.IntegrationTesting/InteropServer.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/csharp/Grpc.IntegrationTesting/InteropServer.cs b/src/csharp/Grpc.IntegrationTesting/InteropServer.cs index 87c3cbe1d4..9475e66c40 100644 --- a/src/csharp/Grpc.IntegrationTesting/InteropServer.cs +++ b/src/csharp/Grpc.IntegrationTesting/InteropServer.cs @@ -88,8 +88,6 @@ namespace Grpc.IntegrationTesting private void Run() { - GrpcEnvironment.Initialize(); - var server = new Server(); server.AddServiceDefinition(TestService.BindService(new TestServiceImpl())); |