aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-24
|\
| * Merge pull request #8418 from markdroth/interop_flagsGravatar Mark D. Roth2016-10-21
| |\
| * \ Merge pull request #8095 from markdroth/rename_client_configGravatar Mark D. Roth2016-10-21
| |\ \
* | | | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-21
|\| | |
| * | | Fix build for importGravatar Craig Tiller2016-10-21
* | | | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-19
|\| | |
| | * | Merge remote-tracking branch 'upstream/master' into rename_client_configGravatar Mark D. Roth2016-10-19
| | |\ \ | | |/ / | |/| |
* | | | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-18
|\ \ \ \
| | | | * 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 branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-18
|\ \ \ \ \
| | * \ \ \ Merge github.com:grpc/grpc into direct-callsGravatar Craig Tiller2016-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
* | | | | | Rename GrpcRpcManager -> ThreadManagerGravatar Sree Kuchibhotla2016-10-13
| * | | | | Moved cv polling into ev_poll_posix.cGravatar Ken Payson2016-10-13
* | | | | | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-13
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| | | * | | Merge github.com:grpc/grpc into direct-callsGravatar Craig Tiller2016-10-10
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add condition variable polling engineGravatar kpayson642016-10-10
| |/ / / /
| | | | * Merge remote-tracking branch 'upstream/master' into rename_client_configGravatar Mark D. Roth2016-10-07
| | | | |\ | | |_|_|/ | |/| | |
| | | * | 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
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-03
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| | | | * | 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 remote-tracking branch 'upstream/master' into rpc_mgrGravatar Sree Kuchibhotla2016-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
| |\ \ \ \ \ \
| | | | | | * | Refactor hash table code into its own module and use it for method_config as ...Gravatar Mark D. Roth2016-09-27
* | | | | | | | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-09-26
|\| | | | | | |
| | | | | | * | Merge branch 'deadline_filter' into service_configGravatar Mark D. Roth2016-09-26
| | | | | | |\ \ | | | | |_|_|/ / | | | |/| | | |
| | | | * | | | Cleanup test, check fail fast or notGravatar Craig Tiller2016-09-26
| | |_|/ / / / | |/| | | | |
| | | | | * | Move method config table code to its own module.Gravatar Mark D. Roth2016-09-23
| | |_|_|/ / | |/| | | |
| | | | * | Merge github.com:grpc/grpc into direct-callsGravatar Craig Tiller2016-09-23
| | | | |\ \ | | |_|_|/ / | |/| | | |
| | | * | | Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-23
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #7611 from markdroth/http_connectGravatar Mark D. Roth2016-09-23
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into cli_listGravatar Yuchen Zeng2016-09-21
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-09-21
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | | * | | | | Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-09-21
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | | | | * | | Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-21
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | | | * | | | Backport of #8055 into v1.0.x.Gravatar Nicolas "Pixel" Noble2016-09-20