Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #7713 from makdharma/cronet_e2e_take2 | makdharma | 2016-08-17 |
|\ | | | | | Cronet e2e take2 | ||
| * | removed file from commit | Makarand Dharmapurikar | 2016-08-11 |
| | | |||
* | | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-11 |
|\ \ | |||
| * \ | Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into ↵ | Jorge Canizales | 2016-08-05 |
| |\ \ | | | | | | | | | | | | | p0-advance-protobuf-version | ||
* | \ \ | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-03 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt Makefile build.yaml package.json src/core/lib/surface/version.c src/csharp/Grpc.Auth/project.json src/csharp/Grpc.Core/VersionInfo.cs src/csharp/Grpc.Core/project.json src/csharp/Grpc.HealthCheck/project.json src/csharp/build_packages.bat src/node/health_check/package.json src/node/tools/package.json src/python/grpcio/grpc_version.py src/python/grpcio_health_checking/grpc_version.py src/python/grpcio_tests/grpc_version.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb tools/distrib/python/grpcio_tools/grpc_version.py tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.c++.internal tools/doxygen/Doxyfile.core tools/doxygen/Doxyfile.core.internal | ||
* | | | | Bug fix on error suppression and comment | Muxi Yan | 2016-08-01 |
| | | | | |||
* | | | | Suppress warning in all libraries whose names starting with gRPC-Core | Muxi Yan | 2016-08-01 |
| | | | | |||
| * | | | Fix local server tests & exceptions tests | Jorge Canizales | 2016-08-01 |
| | | | | |||
* | | | | Use dedicated build configuration 'Cronet' for the new target | Muxi Yan | 2016-08-01 |
| | | | | |||
| * | | | Better names for the methods to clear all host settings | Jorge Canizales | 2016-07-29 |
| | | | | |||
| | * | | Fix usage of proto message parsing | Jorge Canizales | 2016-07-29 |
| | | | | | | | | | | | | On account of https://github.com/google/protobuf/pull/1712 | ||
| | * | | Merge commit '5e623b8d8d8d106bd4ab9a6d77ef43b1a134d8ec' into ↵ | Jorge Canizales | 2016-07-29 |
| | |\ \ | | | | | | | | | | | | | | | | p0-advance-protobuf-version | ||
| | * | | | Update podspecs to use Protobuf 3.0.0 | Jorge Canizales | 2016-07-29 |
| | | | | | | | | | | | | | | | | | | | | The SwiftSample doesn’t build in this commit, but I need to sync with head anyway so I’ll first merge v1.0.x into this branch and then debug. | ||
| * | | | | Reset all host configs *before* setting what we need | Jorge Canizales | 2016-07-29 |
| | | | | | | | | | | | | | | | Not after :) This fixes the local server tests failing to SSL handshake. | ||
* | | | | | Minor revisions | Muxi Yan | 2016-07-29 |
| | | | | | |||
| * | | | | Document | Jorge Canizales | 2016-07-29 |
| | | | | | |||
| * | | | | Leave improving the error message as a TODO | Jorge Canizales | 2016-07-29 |
| | | | | | |||
| * | | | | Let override default response size limit | Jorge Canizales | 2016-07-28 |
| | |/ / | |/| | | | | | | Still missing: Catch the C-library error to improve the error message. | ||
* | | | | Fix Objective-C test pods for Cronet tests | Muxi Yan | 2016-07-27 |
| | | | | |||
| | | * | test harness changes for compiling | Makarand Dharmapurikar | 2016-07-26 |
| | | | | |||
* | | | | Merge pull request #7525 from muxi/add-interop-cronet-test | makdharma | 2016-07-26 |
|\ \ \ \ | |_|_|/ |/| | | | Add InteropTestsRemoteWithCronet to the tests | ||
| * | | | Add InteropTestsRemoteWithCronet to the tests | Muxi Yan | 2016-07-25 |
| | | | | |||
* | | | | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||
* | | | Merge pull request #7368 from muxi/cronet-e2e | makdharma | 2016-07-20 |
|\ \ \ | | | | | | | | | Establish Objective C end-to-end core test with Cronet | ||
| | * \ | Merge pull request #7425 from jcanizales/p0-dynamic-frameworks-build-tests | makdharma | 2016-07-19 |
| | |\ \ | | | | | | | | | | | Automatic test that the library builds correctly with frameworks | ||
| * | | | | Add test target file to repo | Muxi Yan | 2016-07-19 |
| | | | | | |||
| | | | * | Update sample and test versions to -pre1.1 | Jorge Canizales | 2016-07-19 |
| | | |/ | | |/| | | | | | | | | | To use the 3.0.0-beta-4 version of protoc, which has the fix for oneofs when using dynamic frameworks. | ||
| * | | | Let roots_filename be a static variable | Muxi Yan | 2016-07-19 |
| | | | | |||
| * | | | Add fixture description and TODO for test name inferral from test case ↵ | Muxi Yan | 2016-07-19 |
| | | | | | | | | | | | | | | | | method name | ||
| * | | | Collapse fixture into CoreCronetEnd2EndTests.m so that individual test cases ↵ | Muxi Yan | 2016-07-19 |
| | | | | | | | | | | | | | | | | can be run, instead of only allow running the entire fixture | ||
| | * | | Fixup: Readme to 1.0.0-pre1 too instead of 1.0.0 | Jorge Canizales | 2016-07-18 |
| | | | | |||
| | * | | Commit as 1.0.0-pre1 so we can release already. | Jorge Canizales | 2016-07-18 |
| | | | | |||
* | | | | Merge pull request #7245 from muxi/fix-7181 | makdharma | 2016-07-18 |
|\ \ \ \ | | | | | | | | | | | Fix of Issue #7181 documentation and Objective C code | ||
| | * | | | Add new line to the end of fixture.h | Muxi Yan | 2016-07-18 |
| | | | | | |||
| | * | | | Rename h2_ssl_cronet.m to fixture_h2_ssl_cronet.m | Muxi Yan | 2016-07-18 |
| | | | | | |||
| | * | | | Update cronet test comments and structure | Muxi Yan | 2016-07-18 |
| | | | | | |||
| | | * | | We’re done with the underscore tags for good! | Jorge Canizales | 2016-07-18 |
| | | | | | | | | | | | | | | | Yay compatibility and predictability! | ||
| | | * | | BoringSSL 5.0 is now tagged and pushed. | Jorge Canizales | 2016-07-18 |
| | | | | | |||
| | | * | | Point BoringSSL.podspec to 5.0 commit (pending tag) | Jorge Canizales | 2016-07-18 |
| | | | | | |||
| | | * | | Update err_data.c to BoringSSL commit 8d343b44bbab | Jorge Canizales | 2016-07-18 |
| | | | | | |||
| | * | | | Rename h2_ssl.* to h2_ssl_cronet.* and add static specifier to ↵ | Muxi Yan | 2016-07-18 |
| | | | | | | | | | | | | | | | | | | | | chttp2_tear_down_secure_fullstack in h2_ssl_cronet.m | ||
| | | | * | SwiftSample app: ProtoMethod -> GRPCProtoMethod, etc. | Jorge Canizales | 2016-07-15 |
| | | | | | |||
| | | | * | Sample app: ProtoMethod -> GRPCProtoMethod | Jorge Canizales | 2016-07-15 |
| | | | | | |||
| | | | * | SwiftSample app: solve XCode config warnings | Jorge Canizales | 2016-07-15 |
| | | | | | |||
| | | | * | Sample app: solve XCode config warnings | Jorge Canizales | 2016-07-15 |
| | | | | | |||
| | | | * | Build sample app both with and without frameworks | Jorge Canizales | 2016-07-15 |
| | | | | | |||
| | | | * | Misc test scripts cleanup: | Jorge Canizales | 2016-07-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | - Echo commands - Remove generated code before pod install - Don’t “clean” before “build” | ||
| | | | * | Don’t care about installed protoc in the test scripts | Jorge Canizales | 2016-07-15 |
| | | | | | |||
| | | | * | SwiftSample: always use frameworks | Jorge Canizales | 2016-07-15 |
| | | | | | |||
| | | | * | Use google/protobuf/empty.proto in the sample apps | Jorge Canizales | 2016-07-15 |
| | | | | |