aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-08-02
|\
| * Merge pull request #7520 from thunderboltsid/update-gitignoreGravatar Nicolas Noble2016-08-02
| |\
| * \ Merge pull request #7522 from makdharma/enable_secure_endpoint_traceGravatar Nicolas Noble2016-08-02
| |\ \
| * \ \ Merge pull request #7600 from dgquintas/fix_includesGravatar 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
| |\ \ \ \ \ \
| | | * | | | | Fix destroy_call_elem API in test.Gravatar Mark D. Roth2016-08-02
| * | | | | | | Merge pull request #7590 from vjpai/affinity_optionalGravatar Vijay Pai2016-08-02
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-08-02
|\ \ \ \ \ \ \ \ \
| | | | | * | | | | Ran generate_projects.sh.Gravatar 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
| |/| | | | | | | |
* | | | | | | | | | Trying to debug proxy tests. Not working yet.Gravatar Mark D. Roth2016-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 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
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #7602 from kpayson64/downgrade_setuptools.pyGravatar kpayson642016-08-01
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Downgrade docker setuptoolsGravatar Ken Payson2016-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
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
| | | | * | | | | | | regenerated projectsGravatar David Garcia Quintas2016-08-01
| * | | | | | | | | | Merge pull request #7391 from dgquintas/lr_july_16Gravatar Nicolas Noble2016-08-01
| |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | * | | fixed include guard script and faulty .hGravatar David Garcia Quintas2016-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
| | | | | * | | | | | fw-declare struct properlyGravatar David Garcia Quintas2016-08-01
| | | | | * | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
| | | | | |\ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Fix memory leaks.Gravatar Mark D. Roth2016-08-01
| | | | | | * | | | | Don't assert if we're not able to set affinity for some reasonGravatar Vijay Pai2016-07-30
| | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #7553 from podsvirov/topic-cmake-templateGravatar Nicolas Noble2016-07-29
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #7584 from nicolasnoble/manual-upmergeGravatar Nicolas Noble2016-07-29
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #7582 from stanley-cheung/php-fix-zts-errorGravatar 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
| | | * | | | | | | | | | 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
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #7576 from apolcyn/fix_sanity_test_diffGravatar kpayson642016-07-29
| |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge pull request #7568 from apolcyn/update_tests_for_new_nuget_gaGravatar kpayson642016-07-29
| | | |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | Clean up test. Still debugging things.Gravatar Mark D. Roth2016-07-29
| | | * | | | | | | | | | | Merge pull request #7569 from dgquintas/backport_cpp_compression_levelGravatar Nicolas Noble2016-07-29
| | | |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | Fix use-after-free and memory leak problems.Gravatar Mark D. Roth2016-07-29
| | | | | | | | | * | | | | | Some compilers don't like big stack frames. There is no needGravatar Vijay Pai2016-07-29
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Work on debugging the HTTP proxy implementation.Gravatar Mark D. Roth2016-07-29
| | * | | | | | | | | | | | compare test config as objects instead of stringsGravatar Alex Polcyn2016-07-28
| | | | | | | | | * | | | | pr commentsGravatar David Garcia Quintas2016-07-28
| | | | * | | | | | | | | | Merge pull request #7502 from dgquintas/cpp_compression_levelGravatar Nicolas Noble2016-07-28
| | | |/ / / / / / / / / /