src/csharp/Grpc.Examples/MathServiceImpl.cs · 939ccbe0ffb1ece37eca300fe218830000b847b5 · tci-gateway-module / Grpc

"...git@gitlab.uni-hannover.de:tci-gateway-module/grpc.git" did not exist on "ba54a1c95eb9dbcc236f36556352355596cb4e16"

9 years ago

Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 · 46e85b02

Jan Tattermusch authored 9 years ago

Conflicts:
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs
	src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
	src/csharp/Grpc.IntegrationTesting/InteropClient.cs
	src/csharp/Grpc.IntegrationTesting/packages.config
	src/csharp/build_packages.bat

46e85b02

History

Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3

Jan Tattermusch authored 9 years ago

Conflicts:
	src/csharp/Grpc.Core/VersionInfo.cs
	src/csharp/Grpc.Examples.Tests/MathClientServerTests.cs
	src/csharp/Grpc.IntegrationTesting/Grpc.IntegrationTesting.csproj
	src/csharp/Grpc.IntegrationTesting/InteropClient.cs
	src/csharp/Grpc.IntegrationTesting/packages.config
	src/csharp/build_packages.bat