aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Merge pull request #6915 from markdroth/filter_apiGravatar kpayson642016-08-05
|\
* \ Merge pull request #7625 from thunderboltsid/python-test-fixGravatar kpayson642016-08-05
|\ \
| * | Fix the ThreadPoolExecutor: max_workers can't be 0Gravatar siddharthshukla2016-08-03
* | | Merge branch 'v1.0.x' of https://github.com/grpc/grpcGravatar Nicolas "Pixel" Noble2016-08-03
|\ \ \ | |/ / |/| |
| | * clang-formatGravatar Mark D. Roth2016-08-03
* | | Merge pull request #5803 from nicolasnoble/what-the-fuzzGravatar Nicolas Noble2016-08-03
|\ \ \
| | * \ Merge pull request #7572 from jcanizales/p0-4MB-should-be-more-than-enough-fo...Gravatar Jorge Canizales2016-08-03
| | |\ \
* | | \ \ Merge pull request #7554 from muxi/fix-cronet-interop-testGravatar Muxi Yan2016-08-02
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #7370 from rjshade/move_timeout_encodingGravatar kpayson642016-08-02
|\ \ \ \ \ \
| | | | | | * Update destroy_call_elem args from merge.Gravatar Mark D. Roth2016-08-02
| | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into what-the-fuzzGravatar Nicolas "Pixel" Noble2016-08-02
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
| | | | | | * Merge remote-tracking branch 'upstream/master' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge pull request #7522 from makdharma/enable_secure_endpoint_traceGravatar Nicolas Noble2016-08-02
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #6774 from a-veitch/add_resourceGravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #7024 from markdroth/filter_call_init_failureGravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge pull request #7601 from dgquintas/census_stuffGravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | | | | | | | |\ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failureGravatar Mark D. Roth2016-08-02
| | |\ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ Merge pull request #7603 from vitalybuka/stack-use-after-scopeGravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #6924 from dgquintas/grpclb_v0Gravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7575 from vjpai/make_stack_small_againGravatar Vijay Pai2016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ Merge pull request #7580 from jtattermusch/netcore_nuget_to_rtmGravatar Jan Tattermusch2016-08-02
| | | | | | | | | | | |\ \ \
| | * | | | | | | | | | \ \ \ Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Fix stack use after scope in call.cGravatar Vitaly Buka2016-08-01
| |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | moar clang-formatGravatar David Garcia Quintas2016-08-01
| | | * | | | | | | | | | | Changed census static metadata keys for tracing and tag propagationGravatar David Garcia Quintas2016-08-01
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| | | | | | | * | | | | | Bug fix on error suppression and commentGravatar Muxi Yan2016-08-01
* | | | | | | | | | | | | clang-formatGravatar David Garcia Quintas2016-08-01
* | | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16Gravatar David Garcia Quintas2016-08-01
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | fixed premature destruction of lb_clientGravatar David Garcia Quintas2016-08-01
| | | | | | | | * | | | | | Suppress warning in all libraries whose names starting with gRPC-CoreGravatar Muxi Yan2016-08-01
| | | | | | | | | | | | * | Fix local server tests & exceptions testsGravatar Jorge Canizales2016-08-01
| | | | | | | | | | * | | | Merge pull request #7585 from nicolasnoble/bump-to-v1.0.0-pre2Gravatar Nicolas Noble2016-08-01
| | | | | | | | | | |\ \ \ \
| | | * | | | | | | | | | | | fw-declare struct properlyGravatar David Garcia Quintas2016-08-01
| | | | | | | | * | | | | | | Use dedicated build configuration 'Cronet' for the new targetGravatar Muxi Yan2016-08-01
| | | * | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | | | | | | | | | | | * | | fix conditional compilation for netcoreapp1.0 projectsGravatar Jan Tattermusch2016-07-31
| | | | | | | | | | | | | * | Better names for the methods to clear all host settingsGravatar Jorge Canizales2016-07-29
| * | | | | | | | | | | | | | Merge pull request #7584 from nicolasnoble/manual-upmergeGravatar Nicolas Noble2016-07-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ \ \ Merge pull request #7581 from stanley-cheung/php-fix-zts-error-v1_0Gravatar Stanley Cheung2016-07-29
| | | | | | | | | | | |\ \ \ \ \
| | | | * | | | | | | | | | | | | added some separating commentsGravatar David Garcia Quintas2016-07-29
| | | | * | | | | | | | | | | | | Addressed the rest of the PR commentsGravatar David Garcia Quintas2016-07-29
| | | | | | | | | | | | | | | * | Reset all host configs *before* setting what we needGravatar Jorge Canizales2016-07-29
| | | | | | | | | | | | | * | | | Bumping to 1.0.0-pre2.Gravatar Nicolas "Pixel" Noble2016-07-29
| | | | | | | | | | | | |/ / / / | | | | | | | | | | | |/| | | |
| | * | | | | | | | | | | | | | Merge branch 'v1.0.x' into manual-upmergeGravatar Nicolas "Pixel" Noble2016-07-29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | Reordered lines in grpclb.c for readabilityGravatar David Garcia Quintas2016-07-29
| * | | | | | | | | | | | | | | php: missed a macro;Gravatar Stanley Cheung2016-07-29
| |/ / / / / / / / / / / / / /
| | | | | | | | | | | * | | | php: missed a macroGravatar Stanley Cheung2016-07-29
| | | | | | | | | | | | * | | regenerateGravatar Jan Tattermusch2016-07-30
| * | | | | | | | | | | | | | Merge pull request #7576 from apolcyn/fix_sanity_test_diffGravatar kpayson642016-07-29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \