Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into cares | Yuchen Zeng | 2016-08-16 |
|\ | |||
| * | Merge pull request #7633 from thunderboltsid/add-pypy-to-testing-toolchain | kpayson64 | 2016-08-15 |
| |\ | |||
* | | | Fix c and python build on mac os | Yuchen Zeng | 2016-08-11 |
* | | | Build c-ares without running ./configure | Yuchen Zeng | 2016-08-11 |
* | | | Fix python build | Yuchen Zeng | 2016-08-11 |
| * | | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-11 |
| |\ \ | |||
* | | | | Merge remote-tracking branch 'upstream/master' into cares_csharp | Yuchen Zeng | 2016-08-11 |
|\| | | | |||
| * | | | Removed duplicated dependency for grpclb | David Garcia Quintas | 2016-08-09 |
| | * | | Merge pull request #7623 from apolcyn/sys_inter_with_nuget | Nicolas Noble | 2016-08-09 |
| | |\ \ | |||
| | * \ \ | Merge pull request #7605 from sreecha/perf-fix-ga | Nicolas Noble | 2016-08-09 |
| | |\ \ \ | |||
| * | | | | | Extend the deadline of objc-examples-build to 30 minutes | Muxi Yan | 2016-08-09 |
* | | | | | | Merge remote-tracking branch 'upstream/master' into cares | Yuchen Zeng | 2016-08-08 |
|\| | | | | | |||
* | | | | | | Separate event driver from ares wrapper | Yuchen Zeng | 2016-08-08 |
| | * | | | | Reducing diff. | Nicolas "Pixel" Noble | 2016-08-05 |
| | * | | | | That won't work properly. Falling back on fixing the list of dependencies. | Nicolas "Pixel" Noble | 2016-08-05 |
| | * | | | | Using the interop dependencies instead. | Nicolas "Pixel" Noble | 2016-08-05 |
| | * | | | | Hopefully fixing #7639. | Nicolas "Pixel" Noble | 2016-08-05 |
| | * | | | | Undo Go Docker fix - fixed in another PR | Jorge Canizales | 2016-08-05 |
| | * | | | | Merge commit '4e57e8be3911e3030e2ccfd6478be75a3c2b0250' into p0-advance-proto... | Jorge Canizales | 2016-08-05 |
| | |\ \ \ \ | |||
| * | \ \ \ \ | Merge pull request #6915 from markdroth/filter_api | kpayson64 | 2016-08-05 |
| |\ \ \ \ \ \ | |||
| * | | | | | | | Reducing diff. | Nicolas "Pixel" Noble | 2016-08-05 |
| * | | | | | | | That won't work properly. Falling back on fixing the list of dependencies. | Nicolas "Pixel" Noble | 2016-08-05 |
| * | | | | | | | Using the interop dependencies instead. | Nicolas "Pixel" Noble | 2016-08-05 |
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into cares | Yuchen Zeng | 2016-08-05 |
|\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | Hopefully fixing #7639. | Nicolas "Pixel" Noble | 2016-08-05 |
| |/ / / / / / / | |||
* | | | | | | | | Implement c-ares based dns resolver | Yuchen Zeng | 2016-08-05 |
| | | | | | * | | change location of nuget back to normal | Alexander Polcyn | 2016-08-05 |
| | | * | | | | | @pgrosu’s fix of Go’s docker build | Jorge Canizales | 2016-08-04 |
| | | | | | | * | add PyPy to testing toolchain | siddharthshukla | 2016-08-04 |
| | | * | | | | | Fix Jenkins test error | Muxi Yan | 2016-08-03 |
| | | * | | | | | Point out what to do if the sanity check fails | Jorge Canizales | 2016-08-03 |
| * | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-08-04 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||
| | | | | * | | | Merge pull request #7613 from kpayson64/py_protobuf_upgrade | kpayson64 | 2016-08-03 |
| | | | | |\ \ \ | |||
| | | | | | * | | | Bump python protobuf dependency to 3.0.0 | Ken Payson | 2016-08-03 |
| | * | | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-03 |
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||
| | | | | * | | | | Update generated files with new protobuf version | Jorge Canizales | 2016-08-03 |
| | | | | | | | * | using temporary nuget location on windows | Alexander Polcyn | 2016-08-03 |
| | | | | | | | * | ran script to update actual docker files | Alexander Polcyn | 2016-08-02 |
| | | | |_|_|_|/ | | | |/| | | | | |||
| | * | | | | | | Merge pull request #7554 from muxi/fix-cronet-interop-test | Muxi Yan | 2016-08-02 |
| | |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
| | |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge pull request #7254 from nicolasnoble/gcloud-no-image-aliases | Nicolas Noble | 2016-08-02 |
| | |\ \ \ \ \ \ \ \ | |||
| | | | | | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into filter_api | Mark D. Roth | 2016-08-02 |
| | | | | | | |\ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | |||
| | * | | | | | | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * \ \ \ \ | Merge pull request #7610 from kpayson64/downgrade_setuptools | kpayson64 | 2016-08-02 |
| | | | | | | | |\ \ \ \ \ | |||
| | * | | | | | | \ \ \ \ \ | Merge pull request #7024 from markdroth/filter_call_init_failure | kpayson64 | 2016-08-02 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7601 from dgquintas/census_stuff | kpayson64 | 2016-08-02 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * | | | | | Downgrade docker setuptools | Ken Payson | 2016-08-02 |
| | | | | | | | | | | | |_|/ / | | | | | | | | | | | |/| | | | |||
| | | | | | | | | * | | | | | | Fix Jenkins test error | Muxi Yan | 2016-08-02 |
| | | | | | | | | | | | * | | | Merge branch 'filter_call_init_failure' into filter_api | Mark D. Roth | 2016-08-02 |
| | | | | | | | | | | | |\ \ \ | | | | | |_|_|_|_|_|_|_|/ / / | | | | |/| | | | | | | | | | |