aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #7590 from vjpai/affinity_optionalGravatar Vijay Pai2016-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 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
| | | * | regenerated projectsGravatar David Garcia Quintas2016-08-01
* | | | | Merge pull request #7391 from dgquintas/lr_july_16Gravatar Nicolas Noble2016-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
| | | | |\ \ | |_|_|_|/ / |/| | | | |
| | | | | * 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
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #7569 from dgquintas/backport_cpp_compression_levelGravatar Nicolas Noble2016-07-29
| | |\ \ \ \ \ \ \
| | | | | | | | * | Some compilers don't like big stack frames. There is no needGravatar Vijay Pai2016-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
| | |/ / / / / /
* | | | | | | | Merge pull request #7502 from dgquintas/cpp_compression_levelGravatar Nicolas Noble2016-07-28
|\ \ \ \ \ \ \ \
| | | | | | * | | clang-formatGravatar David Garcia Quintas2016-07-28
| | | | * | | | | update to use new nuget client in testsGravatar Alexander Polcyn2016-07-28
| | | |/ / / / /
| | | * | | | | Merge pull request #7551 from murgatroid99/ruby_tools_plugin_argGravatar Nicolas Noble2016-07-28
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge remote-tracking branch 'upstream/v1.0.x' into ruby_tools_plugin_argGravatar murgatroid992016-07-28
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
* | | | | | | | | Merge pull request #7561 from stanley-cheung/php-cleanup-gaGravatar Stanley Cheung2016-07-28
|\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ Merge pull request #7560 from stanley-cheung/php-cleanup-ga-v1_0Gravatar Stanley Cheung2016-07-28
| | | | |\ \ \ \ \ \
| | | | | * | | | | | php: cleanup for GAGravatar Stanley Cheung2016-07-28
| | | | |/ / / / / /
| * | | / / / / / / php: cleanup for GAGravatar Stanley Cheung2016-07-28
|/ / / / / / / / /
| | | * | | | | | Merge pull request #7543 from thinkerou/wrap_php7_on_v1_branch_thirdGravatar Stanley Cheung2016-07-28
| | | |\ \ \ \ \ \
* | | | \ \ \ \ \ \ Merge pull request #7552 from thinkerou/wrap_php7_thirdGravatar Stanley Cheung2016-07-28
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| | | | * | | | | | add macro PHP_GRPC_INIT_HANDLERGravatar thinkerou2016-07-28
| * | | | | | | | | add macro PHP_GRPC_INIT_HANDLERGravatar thinkerou2016-07-28
| | | | * | | | | | delete commented-code for missingGravatar thinkerou2016-07-28
| * | | | | | | | | delete commented-code for missingGravatar thinkerou2016-07-28
| | | | * | | | | | add PHP_GRPC_FREE_CLASS_OBJECT macroGravatar thinkerou2016-07-28
| * | | | | | | | | add PHP_GRPC_FREE_CLASS_OBJECT macroGravatar thinkerou2016-07-28
| | | | * | | | | | fix unused varGravatar thinkerou2016-07-28