Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-02 |
|\ | |||
* | | added gpr_types.h | David Garcia Quintas | 2016-08-01 |
| | | |||
| * | Merge pull request #7502 from dgquintas/cpp_compression_level | Nicolas Noble | 2016-07-28 |
| |\ | | | | | | | C++ Compression Level set properly | ||
* | | | scrubbed codegen/sync.h | David Garcia Quintas | 2016-07-27 |
| | | | |||
* | | | removed codegen/slice_buffer.h and scrubbed codegen/slice.h | David Garcia Quintas | 2016-07-27 |
| | | | |||
* | | | removed codegen/log.h | David Garcia Quintas | 2016-07-27 |
| | | | |||
* | | | removed codegen/time.h | David Garcia Quintas | 2016-07-27 |
| | | | |||
* | | | removed codegen/byte_buffer.h | David Garcia Quintas | 2016-07-27 |
| | | | |||
* | | | removed codegen/alloc.h | David Garcia Quintas | 2016-07-27 |
|/ / | |||
* | | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
|\ \ | | | | | | | V1.0.x merge into master | ||
* \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
|\ \ \ | | | | | | | | | Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf | ||
| | | * | Merge branch 'master' of github.com:grpc/grpc into cpp_compression_level | David Garcia Quintas | 2016-07-22 |
| | | |\ | |||
| | * | \ | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
| | |\ \ \ | | | |_|/ | | |/| | | |||
| | | | * | C++ Compression Level set properly | David Garcia Quintas | 2016-07-21 |
| | | | | | |||
* | | | | | Removed unused version of async_stream.h | David Garcia Quintas | 2016-07-21 |
| |/ / / |/| | | | |||
* | | | | Merge pull request #7488 from ghemawat/slice_user_data | kpayson64 | 2016-07-21 |
|\ \ \ \ | |_|_|/ |/| | | | Add gpr_slice_new_with_user_data. | ||
| | * | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-21 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Merge pull request #7486 from dgquintas/alive_typo | kpayson64 | 2016-07-21 |
|\ \ \ \ | | | | | | | | | | | fixed typo | ||
| | | | * | Merge pull request #7400 from yang-g/ga_branch2 | Nicolas Noble | 2016-07-21 |
| | | | |\ | | | | | | | | | | | | | Cherrypick #7319 into v1.0.x | ||
* | | | | \ | Merge pull request #7469 from yang-g/proto_lite | Nicolas Noble | 2016-07-21 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add a macro to support protobuf lite | ||
| | | * | | | | Add gpr_slice_new_with_user_data. | Sanjay Ghemawat | 2016-07-21 |
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gpr_slice_new_with_user_data is like gpr_slice_new, but allows the caller to specify a distinct pointer to pass to the destroy function. This is useful when the data is part of a larger data structure that should be destroyed when the data is no longer needed. | ||
| | | | * | | Merge pull request #7470 from dgquintas/v1.0.x | Nicolas Noble | 2016-07-20 |
| | | | |\ \ | | | | | | | | | | | | | | | grpc_args doxygen docstrings | ||
| | * | | | | | fixed typo | David Garcia Quintas | 2016-07-20 |
| |/ / / / / |/| | | | | | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-19 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| | | * | | | Merge pull request #7425 from jcanizales/p0-dynamic-frameworks-build-tests | makdharma | 2016-07-19 |
| | | |\ \ \ | | | | | | | | | | | | | | | Automatic test that the library builds correctly with frameworks | ||
* | | | \ \ \ | Merge pull request #7444 from y-zeng/fix_typo | kpayson64 | 2016-07-19 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix typos in config_protobuf.h | ||
* \ \ \ \ \ \ \ | Merge pull request #7399 from sreecha/poll_alloc_fix | Craig Tiller | 2016-07-19 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Reduce the number of unnecessary allocations | ||
| | | | | | | * | | grpc_args doxygen | David Garcia Quintas | 2016-07-19 |
| | | | | | |/ / | | | | | |/| | | |||
| | | * | | | | | Add a macro to support protobuf lite | yang-g | 2016-07-19 |
| | | | | | | | | |||
* | | | | | | | | grpc_args doxygen | David Garcia Quintas | 2016-07-18 |
| |_|/ / / / / |/| | | | | | | |||
| | | * | | | | Separate generated file and protobuf dependency | Yuchen Zeng | 2016-07-18 |
| | | | | | | | |||
| | | | * | | | Polish grpcio_health_checking package | Ken Payson | 2016-07-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Rename namespace to grpc_health->grpc to match spec -Proper use of NOT_FOUND status code -Improve testing -Add source distribution to artifact build | ||
| | | * | | | | fix typo | Yuchen Zeng | 2016-07-18 |
| |_|/ / / / |/| | | | | | |||
| | * | | | | fix typo | Yuchen Zeng | 2016-07-18 |
| |/ / / / |/| | | | | |||
| | | * | | Solve warnings by adding headers not included by grpc.h | Jorge Canizales | 2016-07-15 |
| | |/ / | | | | | | | | | | | | | | | | | The two log.h can’t be listed, though, as they include the nefarious <inttypes.h> (See discussing at BoringSSL.podspec). Not listing them seems to be alright, though. | ||
| | | * | prevent spurious wake up and unstarted/already shutdown server | yang-g | 2016-07-14 |
| | | | | |||
| * | | | Reduce the number of unnecessary allocations | Sree Kuchibhotla | 2016-07-14 |
|/ / / | |||
* | | | Merge pull request #7319 from yang-g/wait_async | kpayson64 | 2016-07-14 |
|\ \ \ | | | | | | | | | Make Server::Wait work for async only server. | ||
| * | | | prevent spurious wake up and unstarted/already shutdown server | yang-g | 2016-07-14 |
| | | | | |||
| | | * | Make Server::Wait work for async only server. | yang-g | 2016-07-13 |
| | |/ | |||
* | | | Merge remote-tracking branch 'upstream/master' into slice | yang-g | 2016-07-12 |
|\ \ \ | | |/ | |/| | |||
| | * | Make Server::Wait work for async only server. | yang-g | 2016-07-11 |
| |/ | |||
| * | Merge pull request #7219 from jcanizales/merge-0.14-into-master | makdharma | 2016-07-08 |
| |\ | | | | | | | Merge 0.14 into master | ||
| * \ | Merge branch 'master' of github.com:grpc/grpc into bb_reader_error | David Garcia Quintas | 2016-07-06 |
| |\ \ | |||
| | * \ | Merge pull request #7174 from dgquintas/remove_unused_status_code_enum_file | Nicolas Noble | 2016-07-06 |
| | |\ \ | | | | | | | | | | | removed unused version of status_code_enum.h | ||
| | * | | | Expunge all references to zookeeper | Craig Tiller | 2016-07-01 |
| | | | | | |||
| * | | | | updated copyright | David Garcia Quintas | 2016-06-30 |
| | | | | | |||
| * | | | | Return success status of grpc_byte_buffer_reader | David Garcia Quintas | 2016-06-30 |
| |/ / / | |||
| | | * | Merge master into merge-0.14-into-master | Jorge Canizales | 2016-06-30 |
| | | |\ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||
| | * | | removed unused version of status_code_enum.h | David Garcia Quintas | 2016-06-30 |
| |/ / |