Merge master into merge-0.14-into-master
Conflicts: - gRPC.podspec - Only had non-trivial changes in the core file list, which will need to be regenerated (in gRPC-Core.podspec). - src/objective-c/BoringSSL.podspec - Had trivial conflicts in the version. - src/objective-c/examples/RemoteTestClient/RemoteTest.podspec - Trivial conflicts in quoting. - src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj and src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj - The master version is used, pending testing. The 0.14 version had emoji and some unneeded entries. - src/objective-c/tests/Podfile - Added CronetFramework pod, and warning silencing from master. - templates/gRPC.podspec.template - Deleted. - third_party/protobuf - Using master commit, but need to verify if it works for frameworks.
No related branches found
No related tags found
Showing
- .travis.yml 44 additions, 12 deletions.travis.yml
- BUILD 652 additions, 140 deletionsBUILD
- CONTRIBUTING.md 7 additions, 0 deletionsCONTRIBUTING.md
- INSTALL.md 1 addition, 1 deletionINSTALL.md
- Makefile 1369 additions, 779 deletionsMakefile
- PYTHON-MANIFEST.in 1 addition, 0 deletionsPYTHON-MANIFEST.in
- README.md 3 additions, 1 deletionREADME.md
- Rakefile 1 addition, 1 deletionRakefile
- binding.gyp 45 additions, 25 deletionsbinding.gyp
- build.yaml 296 additions, 249 deletionsbuild.yaml
- composer.json 0 additions, 1 deletioncomposer.json
- config.m4 60 additions, 27 deletionsconfig.m4
- doc/PROTOCOL-HTTP2.md 2 additions, 2 deletionsdoc/PROTOCOL-HTTP2.md
- doc/c-style-guide.md 1 addition, 1 deletiondoc/c-style-guide.md
- doc/command_line_tool.md 77 additions, 0 deletionsdoc/command_line_tool.md
- doc/compression.md 118 additions, 0 deletionsdoc/compression.md
- doc/connectivity-semantics-and-api.md 1 addition, 1 deletiondoc/connectivity-semantics-and-api.md
- doc/cpp-style-guide.md 91 additions, 0 deletionsdoc/cpp-style-guide.md
- doc/interop-test-descriptions.md 190 additions, 191 deletionsdoc/interop-test-descriptions.md
- doc/statuscodes.md 2 additions, 0 deletionsdoc/statuscodes.md
Loading
Please register or sign in to comment