aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* merge with headGravatar yang-g2017-04-14
|\
| * Merge branch 'makdharma-caching_uri'Gravatar Makarand Dharmapurikar2017-04-14
| |\
| | * Merge branch 'caching_uri' of https://github.com/makdharma/grpc into ↵Gravatar Makarand Dharmapurikar2017-04-14
| |/| | | | | | | | | | makdharma-caching_uri
| * | Merge pull request #10583 from ctiller/server_startGravatar Craig Tiller2017-04-14
| |\ \ | | | | | | | | Threading robustness
| * \ \ Merge pull request #9972 from sreecha/cq_create_api_changesGravatar Sree Kuchibhotla2017-04-14
| |\ \ \ | | | | | | | | | | Completion Queue creation API changes (C-Core and C++ only)
| * \ \ \ Merge pull request #10449 from ctiller/minimal_testGravatar Craig Tiller2017-04-14
| |\ \ \ \ | | | | | | | | | | | | Add a test of minimal stacks, and make it pass
| * | | | | Use _pb2_grpc module to access gRPC entitiesGravatar Mehrdad Afshari2017-04-13
| | | | | |
| * | | | | Merge pull request #10405 from bogdandrutu/metadataGravatar David G. Quintas2017-04-13
| |\ \ \ \ \ | | | | | | | | | | | | | | Change metadata names used by the instrumentation.
| | | * \ \ \ Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-13
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #10630 from ctiller/ubsanGravatar Craig Tiller2017-04-13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | ubsan fixes
| | | | | * \ \ Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-04-13
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge pull request #10651 from dgquintas/master_merge_1.3Gravatar David G. Quintas2017-04-13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge v1.3.x branch back into master
| | * | | | | | | Merge remote-tracking branch 'upstream/v1.3.x' into master_merge_1.3Gravatar David Garcia Quintas2017-04-13
| |/| | | | | | |
| * | | | | | | | Merge pull request #10650 from dgquintas/1.4.0_bumpGravatar David G. Quintas2017-04-13
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | master to 1.4.0-dev
| | | * | | | | | | Merge pull request #10648 from dgquintas/v1.3.x-version-bumpGravatar David G. Quintas2017-04-13
| | |/| | | | | | | | |/| | | | | | | | | | | | | | | | | | 1.3.x branch cut, version bump PR
| | | | | | | * | | Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-04-13
| | | | | | | |\ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | * | | | | | | | master to 1.4.0-devGravatar David Garcia Quintas2017-04-13
| |/ / / / / / / /
| | * / / / / / / 1.3.x branch cutGravatar David Garcia Quintas2017-04-13
| |/ / / / / / /
| * | | | | | | Merge pull request #10617 from murgatroid99/upmerge_1.2.4Gravatar David G. Quintas2017-04-13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Upmerge 1.2.4 into master
| | | | | | * \ \ 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
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add check that we don't schedule the same closure twice at once.
| * \ \ \ \ \ \ \ \ Merge pull request #10612 from markdroth/max_message_size_status_codeGravatar Mark D. Roth2017-04-13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Use RESOURCE_EXHAUSTED for max message size limits.
| | | | | | | | * | | fix mac issuesGravatar Sree Kuchibhotla2017-04-13
| | | | | | | | | | |
| | | | | | * | | | | Change metadata names used by the instrumentation.Gravatar Bogdan Drutu2017-04-13
| | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #10633 from jboeuf/gpr_free_never_fails_on_null_inputGravatar jboeuf2017-04-13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Making sure that gpr_free is a no-op for NULL input.
| | * | | | | | | | | Be more explicit about the contract for free_fn in the ↵Gravatar Julien Boeuf2017-04-13
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gpr_allocation_functions doc.
| | | | | | | | | * using grpc_base64_decode_with_len to simplify codeGravatar Makarand Dharmapurikar2017-04-13
| | | | | | | | | |
| * | | | | | | | | Merge pull request #10625 from matt-kwong/fix-cpp-kokoroGravatar Matt Kwong2017-04-13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix typo in Kokoro scripts
* | | | | | | | | | | get rid of the trailing null in pathGravatar yang-g2017-04-13
| | | | | | | | | | |
| | | | | * | | | | | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4Gravatar murgatroid992017-04-13
| | |_|_|/| | | | | | | |/| | | | | | | | |
| | | | | | | | | * | update commentsGravatar Craig Tiller2017-04-13
| | | | | | | | | | |
| | | | | | | | | | * clang-format fixGravatar Makarand Dharmapurikar2017-04-13
| | | | | | | | | | |
| | | | | | * | | | | ubsan fixesGravatar Craig Tiller2017-04-13
| | |_|_|_|/ / / / / | |/| | | | | | | |
| | | * | | | | | | Fix test.Gravatar Mark D. Roth2017-04-13
| | | | | | | | | |
| | | | | | * | | | Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-13
| | | | | | |\ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | | | | | * | | | Fix duplicated depGravatar Craig Tiller2017-04-13
| | | | | | | | | |
| * | | | | | | | | Merge pull request #10605 from ctiller/ubsanGravatar Craig Tiller2017-04-13
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ubsan fixes
| | | | | | | | * \ \ 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 ↵Gravatar Sree Kuchibhotla2017-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cq_pluck on f->shutdown_cq
| * | | | | | | | | | Merge pull request #10514 from jtattermusch/fix_1mb_scenariosGravatar Jan Tattermusch2017-04-13
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix 1MB perf scenarios
| | | | * | | | | | | | Fix typo in Kokoro scriptsGravatar Matt Kwong2017-04-12
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #10616 from apolcyn/fix_csharp_test_docker_buildGravatar apolcyn2017-04-12
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | remove src/csharp/global.json
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #10595 from matt-kwong/add-individual-sanitizersGravatar Matt Kwong2017-04-12
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add individual sanitizer suites to Kokoro
| * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10586 from yang-g/error_details2Gravatar Yang Gao2017-04-12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add helper function to supply and parse error_details from Status.
| | | | | | | | | | * \ \ \ Merge github.com:grpc/grpc into minimal_testGravatar Craig Tiller2017-04-12
| | | | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge pull request #10619 from grpc/revert-9626-lazy-deframeGravatar Craig Tiller2017-04-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Implement lazy deframe"
| | * | | | | | | | | | | | | Revert "Implement lazy deframe"Gravatar Craig Tiller2017-04-12
| |/ / / / / / / / / / / / /
* / / / / / / / / / / / / / Fix buffer overflow https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=973Gravatar yang-g2017-04-12
|/ / / / / / / / / / / / /
| | | | | | | | | | | * | Merge github.com:grpc/grpc into server_startGravatar Craig Tiller2017-04-12
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| | | | | | | | * | | | | Merge pull request #10606 from murgatroid99/version_bump_1.2.4Gravatar Michael Lumish2017-04-12
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump version to 1.2.4