aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-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
| | | | |
| * | | | 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.
| * | | | Merge pull request #10625 from matt-kwong/fix-cpp-kokoroGravatar Matt Kwong2017-04-13
| |\ \ \ \ | | | | | | | | | | | | Fix typo in Kokoro scripts
| | | | | * Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4Gravatar murgatroid992017-04-13
| | |_|_|/| | |/| | | |
| | | * | | Fix test.Gravatar Mark D. Roth2017-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 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
| |/ / / / / / / / /
| | | | | | | | | * Merge pull request #10606 from murgatroid99/version_bump_1.2.4Gravatar Michael Lumish2017-04-12
| | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | Bump version to 1.2.4
| * | | | | | | | | \ Merge pull request #10593 from matt-kwong/update-create-worker-scriptsGravatar Matt Kwong2017-04-12
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update VM creation scripts to update Linux kernel
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #10473 from ctiller/truebinGravatar Craig Tiller2017-04-12
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | True Binary Encoding
| | | | | | * | | | | | | remove src/csharp/global.jsonGravatar Alexander Polcyn2017-04-12
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #10598 from jtattermusch/manual_upmerge_v12xGravatar David G. Quintas2017-04-12
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Manual upmerge from v1.2.x
| * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #9626 from muxi/lazy-deframeGravatar Muxi Yan2017-04-12
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement lazy deframe
* | | | | | | | | | | | | | Create f->shutdown_cq in the fixtureGravatar Sree Kuchibhotla2017-04-12
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-04-12
|\| | | | | | | | | | | | |
| | | | | | | | | | * | | | Update status codes doc.Gravatar Mark D. Roth2017-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
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send `content-type` header on trailer-only responses
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10540 from muxi/restore-cronet-testsGravatar Muxi Yan2017-04-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore cronet tests
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10604 from ctiller/bmdifffixGravatar Craig Tiller2017-04-12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for bm_diff
| | | | | | | | | | | | | | | * Bump version to 1.2.4Gravatar murgatroid992017-04-12
| | | | | | | | | | | | | | |/
| | | | | | | | | * | | | | | Fix BUILD dependency, copyright and cmakeGravatar yang-g2017-04-12
| | | | | | | | | | | | | | |
| | | | | | | | | | | | | | * Merge pull request #10303 from murgatroid99/makefile_soname_fixGravatar Michael Lumish2017-04-12
| | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix soname version mismatch in Makefile
| | | | | | | | | | | | | | * \ Merge pull request #10563 from murgatroid99/node_server_shutdownGravatar Michael Lumish2017-04-12
| | | | | | | | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Node server shutdown improvements
| | | | | | | | | | | | * | | | | ubsan fixesGravatar Craig Tiller2017-04-12
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | | | Handle 0-lengthGravatar Craig Tiller2017-04-12
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | * | | | | Handle div0Gravatar Craig Tiller2017-04-12
| | |_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Cleanup output: omit unnecessary columnsGravatar Craig Tiller2017-04-12
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix a noise creating bug in bm_json (for bm_diff)Gravatar Craig Tiller2017-04-12
| |/ / / / / / / / / / / / / /
| | | | | | * | | | | | | | | add nlGravatar Craig Tiller2017-04-12
| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | documentGravatar Craig Tiller2017-04-12
| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | fix testGravatar Craig Tiller2017-04-12
| | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | Merge github.com:grpc/grpc into truebinGravatar Craig Tiller2017-04-12
| | | | | | |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | Merge remote-tracking branch 'upstream/v1.2.x' into HEADGravatar Jan Tattermusch2017-04-12
| | |_|_|/| | | | | | | | | | | |/| | | | | | | | | |/ / / | | | | | | |_|_|_|_|/| | | | | | | | |/| | | | | | | |
| | | | | | | | | * | | | | Add individual sanitizer suites to KokoroGravatar Matt Kwong2017-04-11
| | | | | | | | | | | | | |
| | | | | * | | | | | | | | Merge pull request #10579 from murgatroid99/max_message_size_arg_checkingGravatar Michael Lumish2017-04-11
| | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix lower bound on max message size channel arguments