aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | | | Merge pull request #10661 from grpc/v1.3.xGravatar Craig Tiller2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.3.x upmerge
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10660 from ctiller/bugfixesGravatar Craig Tiller2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | Bugfixes
| | | | | | | | * | | | | | Handle EINTR on reading fileGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | |
| | | | | | | | | * | | | | Update ServerGlobalCallback::AddPort apiGravatar yang-g2017-04-14
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #10494 from y-zeng/fix_server_keepaliveGravatar Yuchen Zeng2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix server-side keepalive shutdown process
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10631 from muxi/fix-xcode83-modulemapGravatar Muxi Yan2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix modulemap redefinition problem in Xcode 8.3
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10618 from yang-g/fuzzGravatar Yang Gao2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix buffer overflow found by oss-fuzz
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | | | | | | | | | | | * | | | | | Less samples, more randomGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #10583 from ctiller/server_startGravatar Craig Tiller2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Threading robustness
| | | | | | | | | | | | | * | | | | | Update .gitignoreGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | Tweak defaultsGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | Declare jobsGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | Iterate properlyGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | Properly cleanGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | Fix dir namesGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | Accelerate by running more jobs in parallel, and only building twiceGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Gravatar Muxi Yan2017-04-14
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert-10619-revert-9626-lazy-deframe
| | | | | | | | | | | | | * | | | | | Merge branch 'foo' of github.com:ctiller/grpc into fooGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | |\ \ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ \ \ Merge github.com:grpc/grpc into fooGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #9972 from sreecha/cq_create_api_changesGravatar Sree Kuchibhotla2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Completion Queue creation API changes (C-Core and C++ only)
| | | | | | | * | | | | | | | | | | | | | Fix broken testGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | Fix broken testGravatar Craig Tiller2017-04-14
| | | | | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | | | | Fix broken testGravatar Craig Tiller2017-04-14
| |_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #10449 from ctiller/minimal_testGravatar Craig Tiller2017-04-14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a test of minimal stacks, and make it pass
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #10641 from ctiller/truebinGravatar Craig Tiller2017-04-14
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In all cases when writing, respect what the peer has asked for
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into ↵Gravatar Muxi Yan2017-04-14
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revert-10619-revert-9626-lazy-deframe
* | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | | | | | | | | | | | | * | | | | | Update bm_diff.pyGravatar Craig Tiller2017-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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ubsan fixes
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into cq_create_api_changesGravatar Sree Kuchibhotla2017-04-13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | | Remove arm_arch and hack version numberGravatar Muxi Yan2017-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
| | | | | | | | | | | | | | | | * | | | | | | | Keep LB policy alive during high freq of resolver updatesGravatar David Garcia 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | | | | | | | | * | | | | | | | | | | | | In all cases when writing, respect what the peer has asked for (not what the ↵Gravatar Craig Tiller2017-04-13
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | peer has acknowledged we asked for)
| | | | | | | * | | | | | | | | | | | | | | | | | fix mac issuesGravatar Sree Kuchibhotla2017-04-13
| | | | | | | | | | | | | | | | | | | | | | | | |