Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\ | |||
| * | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
| |\ | |||
| * \ | Merge pull request #7020 from rjshade/assert_not_expect | kpayson64 | 2016-07-25 |
| |\ \ | |||
| * \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
| |\ \ \ | |||
* | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\| | | | | |||
| | | | * | Rerun generate_projects.sh | murgatroid99 | 2016-07-25 |
| * | | | | Merge pull request #7395 from markdroth/handshake_api | kpayson64 | 2016-07-25 |
| |\ \ \ \ | |||
| | | | | * | Fix merge again | murgatroid99 | 2016-07-25 |
| * | | | | | Merge pull request #7501 from dgquintas/phony_async_stream | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #7320 from yang-g/shut_down_acceptor_early | Nicolas Noble | 2016-07-22 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge pull request #7510 from stanley-cheung/regenerate-template-files | Stanley Cheung | 2016-07-22 |
| |\ \ \ \ \ \ \ | |||
| | | | | | | | * | Fixed incorrect merges | murgatroid99 | 2016-07-22 |
| | * | | | | | | | regenerate template files | Stanley Cheung | 2016-07-22 |
| |/ / / / / / / | |||
| | | | | | | * | Actually commit changes to tools/distrib/python/grpcio_tools/setup.py | murgatroid99 | 2016-07-22 |
| | | | | | | * | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
| | |_|_|_|_|/| | |/| | | | | | | |||
| * | | | | | | | Merge pull request #7504 from stanley-cheung/php-update-package-xml | Stanley Cheung | 2016-07-21 |
| |\ \ \ \ \ \ \ | |||
| | | | | | | | * | Merge pull request #7503 from stanley-cheung/php-update-package-xml-v1_0 | Stanley Cheung | 2016-07-21 |
| | | | | | | | |\ | |||
| | * | | | | | | | | php: update composer.json | Stanley Cheung | 2016-07-21 |
| | * | | | | | | | | php: update package.xml to 1.0.0RC2 | Stanley Cheung | 2016-07-21 |
| |/ / / / / / / / | |||
| | | | | | | | * | php: update composer.json | Stanley Cheung | 2016-07-21 |
| | | | | | | | * | php: update package.xml to 1.0.0RC2 | Stanley Cheung | 2016-07-21 |
| | | | | | | |/ | |||
| | | * | | | / | Removed unused version of async_stream.h | David Garcia Quintas | 2016-07-21 |
| | |/ / / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #7488 from ghemawat/slice_user_data | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge pull request #7269 from y-zeng/cli_call | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ \ | |||
| | | | | | | | * | Merge pull request #7491 from kpayson64/remote_linux_whl_artifacts | kpayson64 | 2016-07-21 |
| | | | | | | | |\ | |||
| | | | | | * | | | | Rerun generate_projects.sh | Yuchen Zeng | 2016-07-21 |
| | | | | | * | | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-21 |
| | | | | | |\ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #7486 from dgquintas/alive_typo | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * \ | Merge pull request #7393 from y-zeng/example_makefile | Nicolas Noble | 2016-07-21 |
| | | | | | | | | |\ \ | |||
| * | | | | | | | | \ \ | Merge pull request #7296 from thinkerou/fix_orig | Nicolas Noble | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * \ \ | Merge pull request #7495 from kpayson64/fix_cygrpc_test | Nicolas Noble | 2016-07-21 |
| | | | | | | | | | |\ \ \ | |||
| | | | | | | | | | * \ \ \ | Merge pull request #7494 from nicolasnoble/no_verbose_fix | Nicolas Noble | 2016-07-21 |
| | | | | | | | | | |\ \ \ \ | |||
| | | | | | | | | | | | * | | | Fix cygrpc test | Ken Payson | 2016-07-21 |
| | | | | | | | | | | * | | | | Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fix | Nicolas "Pixel" Noble | 2016-07-21 |
| | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | |/ / / / | | | | | | | | | | |/| | | | | |||
| | | | | | | | | | | | | | * | Remove non-manylinux linux .whl artifacts | Ken Payson | 2016-07-21 |
| | | | | | | | | | | | | |/ | | | | | | | | | | | | |/| | |||
| | | | | | | | | | * | | | | Merge pull request #7400 from yang-g/ga_branch2 | Nicolas Noble | 2016-07-21 |
| | | | | | | | | | |\ \ \ \ | |||
| * | | | | | | | | | \ \ \ \ | Merge pull request #7489 from stanley-cheung/php-fix-minor-style | Stanley Cheung | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | | | | | | | clang-format | Mark D. Roth | 2016-07-21 |
| | | | | | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | Mark D. Roth | 2016-07-21 |
| | | | | | | | |\ \ \ \ \ \ \ \ | |||
| * | | | | | | | \ \ \ \ \ \ \ \ | Merge pull request #7476 from vjpai/enable_cross | Nicolas Noble | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | | * \ \ \ \ | Merge pull request #7462 from ctiller/backport-delayed-write | Nicolas Noble | 2016-07-21 |
| | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | |_|_|/ / | | | | | | | | | | | | | |/| | | | | |||
| * | | | | | | | | | | | | | | | | | Merge pull request #7469 from yang-g/proto_lite | Nicolas Noble | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7465 from grpc/revert-6942-perf_html_report | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | | | Merge pull request #7490 from nicolasnoble/sanitize-master | Nicolas Noble | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | | | | | | Sanitizing master. | Nicolas "Pixel" Noble | 2016-07-21 |
| |/ / / / / / / / / / / / / / / / / / | |||
| | | | | * / / / / / / / / / / / / / | php: fix minor style discrepency | Stanley Cheung | 2016-07-21 |
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |||
| | | | | | | | | | | | | * | | | | | Merge pull request #7487 from thinkerou/on_v1.0.x_support_php7 | Stanley Cheung | 2016-07-21 |
| | | | | | | | | | | | | |\ \ \ \ \ | |||
| * | | | | | | | | | | | | \ \ \ \ \ | Merge pull request #7464 from thinkerou/support_php7_by_marco | Stanley Cheung | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * | | | | | | | | | | | Add gpr_slice_new_with_user_data. | Sanjay Ghemawat | 2016-07-21 |
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |||
| | | | | | | | | | | | | * | | | | | | Merge pull request #7484 from soltanmm/docgen-impro | kpayson64 | 2016-07-21 |
| | | | | | | | | | | | | |\ \ \ \ \ \ |