diff options
| author |  Mark D. Roth <roth@google.com> | 2018-08-17 08:11:10 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2018-08-17 08:11:10 -0700 |
| commit | e9e92d443cdb2b9b9cde7f13eb6a426e988df69a (patch) | |
| tree | 24c6e432b90114c1a5263b848d525ae3e08d2371 /src/csharp/Grpc.Core/Version.csproj.include | |
| parent | 4d6f002780e936290ddc629a6eb04a95567f5f8a (diff) | |
| parent | d19fd1c689b1d60cf329331da7fab5d1ca6063cc (diff) | |
Merge remote-tracking branch 'juanlishen/pf_check_state_before_watch' into pf_keep_unselected_subchannels
Diffstat (limited to 'src/csharp/Grpc.Core/Version.csproj.include')
| -rwxr-xr-x | src/csharp/Grpc.Core/Version.csproj.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core/Version.csproj.include b/src/csharp/Grpc.Core/Version.csproj.include index 6b0731eb40..45bd8ebd85 100755 --- a/src/csharp/Grpc.Core/Version.csproj.include +++ b/src/csharp/Grpc.Core/Version.csproj.include @@ -2,6 +2,6 @@ <Project> <PropertyGroup> <GrpcCsharpVersion>1.15.0-dev</GrpcCsharpVersion> - <GoogleProtobufVersion>3.6.0</GoogleProtobufVersion> + <GoogleProtobufVersion>3.6.1</GoogleProtobufVersion> </PropertyGroup> </Project> |