Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

Grpc
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

8f893e18

Commit 8f893e18 authored 8 years ago by Jan Tattermusch

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/release-0_14' into HEAD

parents 55ca239b 39650266

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

.travis.yml 10 additions, 7 deletions

.travis.yml
src/csharp/Grpc.Core.Tests/Internal/AsyncCallTest.cs 1 addition, 2 deletions

src/csharp/Grpc.Core.Tests/Internal/AsyncCallTest.cs
src/csharp/Grpc.Core/Channel.cs 1 addition, 0 deletions

src/csharp/Grpc.Core/Channel.cs
src/objective-c/tests/Podfile 15 additions, 11 deletions

src/objective-c/tests/Podfile
src/objective-c/tests/RemoteTestClient/RemoteTest.podspec 4 additions, 0 deletions

src/objective-c/tests/RemoteTestClient/RemoteTest.podspec
src/objective-c/tests/Tests.xcodeproj/project.pbxproj 162 additions, 90 deletions

src/objective-c/tests/Tests.xcodeproj/project.pbxproj
templates/package.xml.template 0 additions, 15 deletions

templates/package.xml.template

with 193 additions and 125 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment