Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-04 |
|\ | |||
| * | Merge pull request #7600 from dgquintas/fix_includes | Nicolas Noble | 2016-08-02 |
| |\ | |||
| * \ | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
| |\ \ | |||
| | | * | fixed include guard script and faulty .h | David Garcia Quintas | 2016-08-01 |
| | |/ | |/| | |||
| * | | Merge pull request #7502 from dgquintas/cpp_compression_level | Nicolas Noble | 2016-07-28 |
| |\ \ | |||
| * \ \ | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-07-24 |
|\ \ \ \ \ \ | |||
| | | | | * \ | 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 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| | | | | * | merge to upstream/master | Alistair Veitch | 2016-07-21 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | * | | | 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 |
| |\ \ \ \ \ | |||
| | | | | * \ | Merge pull request #7400 from yang-g/ga_branch2 | Nicolas Noble | 2016-07-21 |
| | | | | |\ \ | |||
| * | | | | \ \ | Merge pull request #7469 from yang-g/proto_lite | Nicolas Noble | 2016-07-21 |
| |\ \ \ \ \ \ \ | |||
| | | | * | | | | | Add gpr_slice_new_with_user_data. | Sanjay Ghemawat | 2016-07-21 |
| | |_|/ / / / / | |/| | | | | | | |||
| | | | | * | | | Merge pull request #7470 from dgquintas/v1.0.x | Nicolas Noble | 2016-07-20 |
| | | | | |\ \ \ | |||
| | | * | | | | | | 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 |
| | | | |\ \ \ \ | |||
| * | | | \ \ \ \ | Merge pull request #7444 from y-zeng/fix_typo | kpayson64 | 2016-07-19 |
| |\ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-07-19 |
|\| | | | | | | | | | |||
| * | | | | | | | | | Merge pull request #7399 from sreecha/poll_alloc_fix | Craig Tiller | 2016-07-19 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | | grpc_args doxygen | David Garcia Quintas | 2016-07-19 |
| | | | | | | |/ / / | | | | | | |/| | | | |||
| | | | * | | | | | | Add a macro to support protobuf lite | yang-g | 2016-07-19 |
* | | | | | | | | | | Fix gcc4.4 error | Craig Tiller | 2016-07-19 |
| * | | | | | | | | | grpc_args doxygen | David Garcia Quintas | 2016-07-18 |
| | |_|/ / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Fix merge error | Craig Tiller | 2016-07-18 |
| | | | * | | | | | Separate generated file and protobuf dependency | Yuchen Zeng | 2016-07-18 |
| | | | | * | | | | Polish grpcio_health_checking package | Ken Payson | 2016-07-18 |
| | | | * | | | | | 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 |
| | | |/ / / | |||
* | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-07-15 |
|\| | | | | | |||
| | | | * | | 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 |
| |\ \ \ \ | |||
| | * | | | | 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 branch 'delayed-write' into grand-unified-closures | Craig Tiller | 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 github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-07-08 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #7219 from jcanizales/merge-0.14-into-master | makdharma | 2016-07-08 |
| |\ \ \ | |||
* | | | | | Merge github.com:grpc/grpc into atm2 | Craig Tiller | 2016-07-07 |
|\| | | | | |||
| * | | | | 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 |
| | |\ \ \ \ |