Merge pull request #6884 from jtattermusch/manual_upmerge_0_14_to_master
Manually Upmerge changes from 0.14 release branch into master
Showing
- .travis.yml 10 additions, 7 deletions.travis.yml
- package.xml 0 additions, 15 deletionspackage.xml
- src/csharp/Grpc.Core.Tests/Internal/AsyncCallTest.cs 1 addition, 1 deletionsrc/csharp/Grpc.Core.Tests/Internal/AsyncCallTest.cs
- src/objective-c/tests/Podfile 15 additions, 11 deletionssrc/objective-c/tests/Podfile
- src/objective-c/tests/RemoteTestClient/RemoteTest.podspec 4 additions, 0 deletionssrc/objective-c/tests/RemoteTestClient/RemoteTest.podspec
- src/objective-c/tests/Tests.xcodeproj/project.pbxproj 162 additions, 90 deletionssrc/objective-c/tests/Tests.xcodeproj/project.pbxproj
- src/objective-c/tests/build_tests.sh 3 additions, 0 deletionssrc/objective-c/tests/build_tests.sh
- templates/package.xml.template 0 additions, 15 deletionstemplates/package.xml.template
Loading
Please register or sign in to comment