Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2016-08-24 | |
|\ | |||
| * | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | 2016-08-23 | |
| |\ | |||
| * | | php: bump version | 2016-08-22 | |
| | * | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | 2016-08-20 | |
| |/| | |||
* | | | Remove improper ifdef | 2016-08-19 | |
* | | | Remove dependency on node c-ares | 2016-08-19 | |
* | | | Add back native resolver | 2016-08-18 | |
| | * | Bumping version to 1.0.1-pre1. | 2016-08-18 | |
| | * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | 2016-08-17 | |
| * | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | 2016-08-16 | |
| |\| | |||
| | * | php: update package.xml | 2016-08-09 | |
* | | | Separate event driver from ares wrapper | 2016-08-08 | |
* | | | Merge remote-tracking branch 'upstream/master' into cares | 2016-08-05 | |
|\| | | |||
* | | | Implement c-ares based dns resolver | 2016-08-05 | |
| * | | Merge pull request #7370 from rjshade/move_timeout_encoding | 2016-08-02 | |
| |\ \ | |||
| * \ \ | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| |\ \ \ \ | |||
* | | | | | | Add c-ares in Makefile.template | 2016-07-28 | |
| | | | | * | php: cleanup for GA | 2016-07-28 | |
| | * | | | | php: cleanup for GA | 2016-07-28 | |
| |/ / / / |/| | | | | |||
| | | | * | Merge pull request #7499 from thinkerou/wrap_php7_on_v1_branch | 2016-07-26 | |
| | | | |\ | |||
* | | | | \ | Merge pull request #7498 from thinkerou/wrap_php7 | 2016-07-26 | |
|\ \ \ \ \ \ | |||
| | | | * \ \ | Merge branch 'master' into move_timeout_encoding | 2016-07-26 | |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| * | | | | | | add file to build.yaml | 2016-07-25 | |
| | | | | | * | add new file to build.yaml | 2016-07-25 | |
* | | | | | | | Merge pull request #7395 from markdroth/handshake_api | 2016-07-25 | |
|\ \ \ \ \ \ \ | |||
* | | | | | | | | php: update package.xml to 1.0.0RC2 | 2016-07-21 | |
| |/ / / / / / |/| | | | | | | |||
| | | | | * | | php: update package.xml to 1.0.0RC2 | 2016-07-21 | |
| | | | | |/ | |||
| | | * | | | merge to upstream/master | 2016-07-21 | |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
| | * | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-07-14 | |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | 2016-07-14 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | Added handshaker.[ch] to build.yaml. | 2016-07-14 | |
| | | | * | | Merge branch 'master' into move_timeout_encoding | 2016-07-14 | |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | |||
| | | | * | | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | 2016-07-13 | |
| | |_|/ / | |/| | | | |||
* / | | | | php: prepare for GA release | 2016-07-13 | |
|/ / / / | |||
| | | * | php: prepare for GA release | 2016-07-13 | |
* | | | | Master is now 1.1.0-dev. | 2016-07-12 | |
| |_|/ |/| | | |||
* | | | Flagging master as 1.0.0-pre1. | 2016-07-12 | |
* | | | php: update package.xml | 2016-06-30 | |
* | | | Resolved merge conflicts with master | 2016-06-27 | |
|\ \ \ | |||
| * \ \ | Merge pull request #6973 from makdharma/network_status_change | 2016-06-27 | |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #6803 from sreecha/epoll_changes | 2016-06-25 | |
| |\ \ \ \ | |||
| * | | | | | Update master branch to 0.16.0-dev | 2016-06-24 | |
| | * | | | | Merge branch 'master' into epoll_changes_merged | 2016-06-21 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | * | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-06-20 | |
| | | | |\ \ | | |_|_|/ / | |/| | | | | |||
| | | * | | | more files after running build.yaml changes through | 2016-06-20 | |
| | |/ / / | |/| | | | |||
* | | | | | Resolved merge conflicts with master | 2016-06-20 | |
|\| | | | | |||
| * | | | | Merge github.com:grpc/grpc into error | 2016-06-16 | |
| |\ \ \ \ | |||
| | | * \ \ | Merge branch 'master' into epoll_changes | 2016-06-16 | |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | | | * | | added missing grpclb.h dep in build.yaml | 2016-06-15 |