aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Merge pull request #10494 from y-zeng/fix_server_keepaliveGravatar Yuchen Zeng2017-04-14
|\
* \ Merge pull request #10631 from muxi/fix-xcode83-modulemapGravatar Muxi Yan2017-04-14
|\ \
* \ \ Merge branch 'caching_uri' of https://github.com/makdharma/grpc into makdharm...Gravatar Makarand Dharmapurikar2017-04-14
|\ \ \
* \ \ \ Merge pull request #10583 from ctiller/server_startGravatar Craig Tiller2017-04-14
|\ \ \ \
* \ \ \ \ Merge pull request #9972 from sreecha/cq_create_api_changesGravatar Sree Kuchibhotla2017-04-14
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #10449 from ctiller/minimal_testGravatar Craig Tiller2017-04-14
|\ \ \ \ \ \
* | | | | | | Use _pb2_grpc module to access gRPC entitiesGravatar Mehrdad Afshari2017-04-13
* | | | | | | Merge pull request #10405 from bogdandrutu/metadataGravatar David G. Quintas2017-04-13
|\ \ \ \ \ \ \
| | * \ \ \ \ \ Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-13
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #10630 from ctiller/ubsanGravatar Craig Tiller2017-04-13
|\ \ \ \ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-04-13
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| | | | | | | * | Remove arm_arch and hack version numberGravatar Muxi Yan2017-04-13
| | | | * | | | | Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-04-13
| | | | |\ \ \ \ \
* | | | | | | | | | master to 1.4.0-devGravatar David Garcia Quintas2017-04-13
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #10617 from murgatroid99/upmerge_1.2.4Gravatar David G. Quintas2017-04-13
|\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-04-13
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #10475 from markdroth/closure_debug_schedule_checkGravatar Mark D. Roth2017-04-13
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge pull request #10612 from markdroth/max_message_size_status_codeGravatar Mark D. Roth2017-04-13
|\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | fix mac issuesGravatar Sree Kuchibhotla2017-04-13
| | | | | * | | | | | | Change metadata names used by the instrumentation.Gravatar Bogdan Drutu2017-04-13
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
| | | | | | | | * | | using grpc_base64_decode_with_len to simplify codeGravatar Makarand Dharmapurikar2017-04-13
| | | * | | | | | | | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4Gravatar murgatroid992017-04-13
| |_|/| | | | | | | | |/| | | | | | | | | |
| | | | * | | | | | | ubsan fixesGravatar Craig Tiller2017-04-13
| |_|_|/ / / / / / / |/| | | | | | | | |
| | | | * | | | | | Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-13
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #10605 from ctiller/ubsanGravatar Craig Tiller2017-04-13
|\ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-04-13
| | | | | | |\ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| | | | | | * | | | | Add shutdown_cq as a server cq so that progress can be made when calling cq_p...Gravatar Sree Kuchibhotla2017-04-13
| | | | | | | | | | * Add GRPC_CHTTP2_KEEPALIVE_STATE_DISABLEDGravatar Yuchen Zeng2017-04-12
* | | | | | | | | | | Merge pull request #10616 from apolcyn/fix_csharp_test_docker_buildGravatar apolcyn2017-04-12
|\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | Fix modulemap redefinitionGravatar Muxi Yan2017-04-12
| |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #10586 from yang-g/error_details2Gravatar Yang Gao2017-04-12
|\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-12
| | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Revert "Implement lazy deframe"Gravatar Craig Tiller2017-04-12
| | | | | | | | | * | | Merge github.com:grpc/grpc into server_startGravatar Craig Tiller2017-04-12
| | | | | | | | | |\ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| | | | | | | * | | | | add missing refsGravatar Craig Tiller2017-04-12
| | | | | | | * | | | | Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-12
| | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #10473 from ctiller/truebinGravatar Craig Tiller2017-04-12
|\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | remove src/csharp/global.jsonGravatar Alexander Polcyn2017-04-12
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #10598 from jtattermusch/manual_upmerge_v12xGravatar David G. Quintas2017-04-12
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #9626 from muxi/lazy-deframeGravatar Muxi Yan2017-04-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * | | | Create f->shutdown_cq in the fixtureGravatar Sree Kuchibhotla2017-04-12
| | | | | | | | | | * | | | Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-04-12
| | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |
| | | | | | | | | | | | * | fixed asan buffer overflowGravatar Makarand Dharmapurikar2017-04-12
| | | | | | * | | | | | | | Fix message_size_filter to use RESOURCE_EXHAUSTED status code.Gravatar Mark D. Roth2017-04-12
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #10566 from muxi/fix-trailer-onlyGravatar Muxi Yan2017-04-12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | * \ Merge remote-tracking branch 'refs/remotes/origin/master' into caching_uriGravatar Makarand Dharmapurikar2017-04-12
| | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #10540 from muxi/restore-cronet-testsGravatar Muxi Yan2017-04-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | | | | Bump version to 1.2.4Gravatar murgatroid992017-04-12
| | | | | | | | | * | | | | | Merge pull request #10563 from murgatroid99/node_server_shutdownGravatar Michael Lumish2017-04-12
| | | | | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | | | | ubsan fixesGravatar Craig Tiller2017-04-12