aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into circular_dependency_fixGravatar Mark D. Roth2016-10-26
|\
* | Move method_config module from ext/client_channel to lib/transport.Gravatar Mark D. Roth2016-10-26
| * Merge remote-tracking branch 'upstream/master' into resolver_channel_argsGravatar Mark D. Roth2016-10-26
| |\ | |/ |/|
* | Merge pull request #8377 from htuch/alpnGravatar Craig Tiller2016-10-26
|\ \
* \ \ Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-25
|\ \ \
| * \ \ Merge pull request #8437 from makdharma/stress_test_optionsGravatar makdharma2016-10-25
| |\ \ \
| * \ \ \ Merge pull request #8281 from gcasto/cronet_cpp_apiGravatar Yang Gao2016-10-24
| |\ \ \ \
| | | | | * Merge remote-tracking branch 'upstream/master' into resolver_channel_argsGravatar Mark D. Roth2016-10-24
| | | | | |\ | | |_|_|_|/ | |/| | | |
| | | | * | Fix handshake_client bind flakes and build issues.Gravatar Harvey Tuch2016-10-24
| | | | * | Introduce a grpc-exp ALPN protocol identifier.Gravatar Harvey Tuch2016-10-24
| | |_|/ / | |/| | |
* | | | | Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-21
|\ \ \ \ \
| | | | | * Merge remote-tracking branch 'upstream/master' into resolver_channel_argsGravatar Mark D. Roth2016-10-21
| | | | | |\ | | |_|_|_|/ | |/| | | |
| | * | | | Merge pull request #8418 from markdroth/interop_flagsGravatar Mark D. Roth2016-10-21
| |/| | | |
| | | | | * Remove resolver_result.Gravatar Mark D. Roth2016-10-21
| * | | | | Merge pull request #8095 from markdroth/rename_client_configGravatar Mark D. Roth2016-10-21
| |\ \ \ \ \
| * | | | | | Fix build for importGravatar Craig Tiller2016-10-21
| | |_|_|_|/ | |/| | | |
| | | | | * modify stress_test command line optionsGravatar Makarand Dharmapurikar2016-10-20
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-19
|\| | | |
| | * | | Merge remote-tracking branch 'upstream/master' into rename_client_configGravatar Mark D. Roth2016-10-19
| | |\ \ \ | | |/ / / | |/| | |
* | | | | Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-19
|\ \ \ \ \
| | | | * | Allow specifying extra flags for C++ interop server.Gravatar Mark D. Roth2016-10-18
| | |_|/ / | |/| | |
| | * | | Merge remote-tracking branch 'upstream/master' into service_configGravatar Mark D. Roth2016-10-18
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #8371 from yang-g/server_context_spouseGravatar Yang Gao2016-10-18
| |\ \ \ \
| * \ \ \ \ Merge github.com:grpc/grpc into direct-callsGravatar Craig Tiller2016-10-17
| |\ \ \ \ \
| | | | | | * Merge remote-tracking branch 'upstream/master' into cronet_cpp_apiGravatar Garrett Casto2016-10-17
| | | | | | |\
| | | | * | | | Rename grpc_hash_table to grpc_mdstr_hash_table.Gravatar Mark D. Roth2016-10-14
| | | * | | | | Add a simple testGravatar yang-g2016-10-13
| | | * | | | | Add a test spouse for server contextGravatar yang-g2016-10-13
| | | | |_|_|/ | | | |/| | |
| | * | | | | Moved cv polling into ev_poll_posix.cGravatar Ken Payson2016-10-13
| * | | | | | Merge github.com:grpc/grpc into direct-callsGravatar Craig Tiller2016-10-10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Add condition variable polling engineGravatar kpayson642016-10-10
| | |/ / / /
* | | | | | Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-07
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | UV tests pass on linuxGravatar murgatroid992016-10-07
| | | | * | Merge remote-tracking branch 'upstream/master' into rename_client_configGravatar Mark D. Roth2016-10-07
| | | | |\ \ | | |_|_|/ / | |/| | | |
| | | | | * Add C++ ApiGravatar Garrett Casto2016-10-04
| | | * | | Merge remote-tracking branch 'upstream/master' into service_configGravatar Mark D. Roth2016-10-04
| | | |\ \ \ | | | | | |/ | | | | |/|
| * | | | | Merge remote-tracking branch 'upstream/master' into fake_resolverGravatar Mark D. Roth2016-10-04
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | | | * | Add h2_fake_resolver end2end test fixture.Gravatar Mark D. Roth2016-10-03
| | | * | | Merge github.com:grpc/grpc into direct-callsGravatar Craig Tiller2016-10-03
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | | * | Merge branch 'fake_resolver' into service_configGravatar Mark D. Roth2016-10-03
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Add fake resolver for tests.Gravatar Mark D. Roth2016-10-03
| | * | | | Merge pull request #8179 from stanley-cheung/php-proto3-prGravatar Stanley Cheung2016-10-03
| | |\ \ \ \
| | * | | | | Merge pull request #8205 from ctiller/crashyGravatar Craig Tiller2016-10-03
| |/| | | | |
* | | | | | | Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-03
|\| | | | | |
* | | | | | | Compile and link core tests with libuvGravatar murgatroid992016-10-03
| | | | | * | Merge remote-tracking branch 'upstream/master' into service_configGravatar Mark D. Roth2016-09-30
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | |
| | | * | | | PHP Proto3: run generate_projects.shGravatar Stanley Cheung2016-09-29
| | |/ / / / | |/| | | |
| * | | | | Merge branch 'master' of https://github.com/grpc/grpc into master-upmerge-fro...Gravatar Nicolas "Pixel" Noble2016-09-29
| |\ \ \ \ \
| | | | * \ \ Merge github.com:grpc/grpc into direct-callsGravatar Craig Tiller2016-09-29
| | | | |\ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-underGravatar Nicolas "Pixel" Noble2016-09-29
| |\ \ \ \ \ \