Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-30 |
|\ | |||
| * | Merge pull request #7839 from markdroth/rename_client_config | Mark D. Roth | 2016-08-29 |
| |\ | | | | | | | Rename grpc_client_config to grpc_resolver_result. | ||
| * | | php: error out if metadata key is not legal | Stanley Cheung | 2016-08-26 |
| | | | |||
| * | | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | Nicolas Noble | 2016-08-23 |
| |\ \ | | | | | | | | | Upmerge from v1.0.x | ||
| | | * | Rename grpc_client_config to grpc_resolver_result. | Mark D. Roth | 2016-08-22 |
| | | | | |||
| * | | | php: bump version | Stanley Cheung | 2016-08-22 |
| | |/ | |/| | |||
| | * | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
| |/| | |||
| | * | Bumping version to 1.0.1-pre1. | Nicolas "Pixel" Noble | 2016-08-18 |
| | | | |||
| | * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | Nicolas "Pixel" Noble | 2016-08-17 |
| | | | |||
| * | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-16 |
| |\| | |||
| | * | php: update package.xml | Stanley Cheung | 2016-08-09 |
| | | | |||
| * | | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
| |\ \ | | | | | | | | | Move timeout_encoding to core/lib/transport | ||
| * \ \ | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
| |\ \ \ | | | | | | | | | | | Add Census resource API and implementation. | ||
* | | | | | 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 branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| |\ \ \ \ | |||
| | | | | * | php: cleanup for GA | Stanley Cheung | 2016-07-28 |
| | | | | | | |||
| | * | | | | php: cleanup for GA | Stanley Cheung | 2016-07-28 |
| | | | | | | |||
* | | | | | | 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 #7499 from thinkerou/wrap_php7_on_v1_branch | kpayson64 | 2016-07-26 |
| | | | |\ | | | | | | | | | | | | | PHP: use php7_wrapper to reduce dup-codes on v1.0.x branch | ||
* | | | | \ | Merge pull request #7498 from thinkerou/wrap_php7 | kpayson64 | 2016-07-26 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PHP: use php7_wrapper to reduce duplicated codes(first part) | ||
| | | | * \ \ | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| * | | | | | | add file to build.yaml | Stanley Cheung | 2016-07-25 |
| | | | | | | | |||
| | | | | | * | add new file to build.yaml | Stanley Cheung | 2016-07-25 |
| | | | | | | | |||
* | | | | | | | Merge pull request #7395 from markdroth/handshake_api | kpayson64 | 2016-07-25 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | General-purpose handshaker API. | ||
* | | | | | | | | php: update package.xml to 1.0.0RC2 | Stanley Cheung | 2016-07-21 |
| |/ / / / / / |/| | | | | | | |||
| | | | | * | | php: update package.xml to 1.0.0RC2 | Stanley Cheung | 2016-07-21 |
| | | | | |/ | |||
| | | * | | | merge to upstream/master | Alistair Veitch | 2016-07-21 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
| | * | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-07-14 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | Mark D. Roth | 2016-07-14 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | Added handshaker.[ch] to build.yaml. | Mark D. Roth | 2016-07-14 |
| | | | | | | |||
| | | | * | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-14 |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | |||
| | | | * | | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | Robbie Shade | 2016-07-13 |
| | |_|/ / | |/| | | | |||
* / | | | | php: prepare for GA release | Stanley Cheung | 2016-07-13 |
|/ / / / | |||
| | | * | php: prepare for GA release | Stanley Cheung | 2016-07-13 |
| | | | | |||
* | | | | Master is now 1.1.0-dev. | Nicolas "Pixel" Noble | 2016-07-12 |
| |_|/ |/| | | |||
* | | | Flagging master as 1.0.0-pre1. | Nicolas "Pixel" Noble | 2016-07-12 |
| | | | |||
* | | | php: update package.xml | Stanley Cheung | 2016-06-30 |
| | | | |||
* | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-27 |
|\ \ \ | |||
| * \ \ | Merge pull request #6973 from makdharma/network_status_change | Jan Tattermusch | 2016-06-27 |
| |\ \ \ | | | | | | | | | | | Network status tracking | ||
| * \ \ \ | Merge pull request #6803 from sreecha/epoll_changes | Craig Tiller | 2016-06-25 |
| |\ \ \ \ | | | | | | | | | | | | | New epoll based polling implementation | ||
| * | | | | | Update master branch to 0.16.0-dev | murgatroid99 | 2016-06-24 |
| | | | | | | |||
| | * | | | | Merge branch 'master' into epoll_changes_merged | Sree Kuchibhotla | 2016-06-21 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | * | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-06-20 |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | * | | | more files after running build.yaml changes through | Makarand Dharmapurikar | 2016-06-20 |
| | |/ / / | |/| | | | |||
* | | | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
|\| | | | |