Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Rerun generate_projects.sh | murgatroid99 | 2016-07-25 |
| | |||
* | Fix merge again | murgatroid99 | 2016-07-25 |
| | |||
* | Fixed incorrect merges | murgatroid99 | 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 |
|\ \ | | | | | | | PHP: update package xml and composer.json | ||
| | * | Merge pull request #7503 from stanley-cheung/php-update-package-xml-v1_0 | Stanley Cheung | 2016-07-21 |
| | |\ | | | | | | | | | PHP: update package.xml and composer.json | ||
| * | | | 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 |
| |/ | |||
* | | Merge pull request #7488 from ghemawat/slice_user_data | kpayson64 | 2016-07-21 |
|\ \ | | | | | | | Add gpr_slice_new_with_user_data. | ||
* \ \ | Merge pull request #7269 from y-zeng/cli_call | kpayson64 | 2016-07-21 |
|\ \ \ | | | | | | | | | Support server reflection in CLI | ||
| | | * | Merge pull request #7491 from kpayson64/remote_linux_whl_artifacts | kpayson64 | 2016-07-21 |
| | | |\ | | | | | | | | | | | Remove non-manylinux linux .whl artifacts | ||
* | | | \ | Merge pull request #7486 from dgquintas/alive_typo | kpayson64 | 2016-07-21 |
|\ \ \ \ \ | | | | | | | | | | | | | fixed typo | ||
| | | | * \ | Merge pull request #7393 from y-zeng/example_makefile | Nicolas Noble | 2016-07-21 |
| | | | |\ \ | | | | | | | | | | | | | | | Enable server reflection in c++ examples | ||
* | | | | \ \ | Merge pull request #7296 from thinkerou/fix_orig | Nicolas Noble | 2016-07-21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fix orig files for conflicting generated | ||
| | | | | * \ \ | Merge pull request #7495 from kpayson64/fix_cygrpc_test | Nicolas Noble | 2016-07-21 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | Fix cygrpc test | ||
| | | | | * \ \ \ | Merge pull request #7494 from nicolasnoble/no_verbose_fix | Nicolas Noble | 2016-07-21 |
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Make default log verbosity ERROR, run tests with DEBUG | ||
| | | | | | | * | | | 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 |
| | | | | | |\ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/run_tests/run_tests.py | ||
| | | | | | | | | * | 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 |
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Cherrypick #7319 into v1.0.x | ||
* | | | | | \ \ \ \ | Merge pull request #7489 from stanley-cheung/php-fix-minor-style | Stanley Cheung | 2016-07-21 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | php: fix minor style discrepency | ||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #7476 from vjpai/enable_cross | Nicolas Noble | 2016-07-21 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Makefile modifications and instructions to enable cross-compilation | ||
| | | | | | | * \ \ \ \ | Merge pull request #7462 from ctiller/backport-delayed-write | Nicolas Noble | 2016-07-21 |
| | | | | | | |\ \ \ \ \ | | | | | | | | |_|_|/ / | | | | | | | |/| | | | | Backport delayed write into v1.0.x branch | ||
* | | | | | | | | | | | | Merge pull request #7469 from yang-g/proto_lite | Nicolas Noble | 2016-07-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a macro to support protobuf lite | ||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7465 from grpc/revert-6942-perf_html_report | kpayson64 | 2016-07-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Generate html report for perf tests" | ||
* \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7490 from nicolasnoble/sanitize-master | Nicolas Noble | 2016-07-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitizing master. | ||
| * | | | | | | | | | | | | | | 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 |
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [support PHP7 on v1.0.x branch] control code by version of PHP macro | ||
* | | | | | | | | \ \ \ \ \ | Merge pull request #7464 from thinkerou/support_php7_by_marco | Stanley Cheung | 2016-07-21 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [support PHP7] control code by version of PHP macro | ||
| | | | | | | | * | | | | | | | Add gpr_slice_new_with_user_data. | Sanjay Ghemawat | 2016-07-21 |
| |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gpr_slice_new_with_user_data is like gpr_slice_new, but allows the caller to specify a distinct pointer to pass to the destroy function. This is useful when the data is part of a larger data structure that should be destroyed when the data is no longer needed. | ||
| | | | | | | | * | | | | | | Merge pull request #7484 from soltanmm/docgen-impro | kpayson64 | 2016-07-21 |
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade virtualenv pip in Python docgen | ||
| | | | | | | | | | * | | | | | support php7 on v1.0.x branch | thinkerou | 2016-07-21 |
| | | | | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | | Merge pull request #7480 from murgatroid99/node_tools_tarball_names | Nicolas Noble | 2016-07-20 |
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct shell scripting mistake in node package generation code | ||
| | | | | | | | * \ \ \ \ \ \ \ | Merge pull request #7470 from dgquintas/v1.0.x | Nicolas Noble | 2016-07-20 |
| | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grpc_args doxygen docstrings | ||
| | | | | | * | | | | | | | | | | | fixed typo | David Garcia Quintas | 2016-07-20 |
| |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | |||
| | | | | | | | | | * | | | | | | Upgrade virtualenv pip in Python docgen | Masood Malekghassemi | 2016-07-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ignore the docgen-generated directories under doc/. | ||
* | | | | | | | | | | | | | | | | Merge pull request #7368 from muxi/cronet-e2e | makdharma | 2016-07-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Establish Objective C end-to-end core test with Cronet | ||
| | | | | | | * | | | | | | | | | | Addressed review comments | Yuchen Zeng | 2016-07-20 |
| | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | Merge pull request #7294 from dgquintas/lb_docs_update | David G. Quintas | 2016-07-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added LB diagram and some more detail | ||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7454 from dgquintas/tiny_comment_update | David G. Quintas | 2016-07-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated outdated comment about uchannels | ||
| | | | | | | | | | | | * | | | | | | | Correct shell scripting mistake in node package generation code | murgatroid99 | 2016-07-20 |
| | | | | | | | | | | |/ / / / / / / | | | | | | | | | | |/| | | | | | | | |||
| | | | * | | | | | | | | | | | | | | Merge pull request #1 from stanley-cheung/support_php7_by_marco | 田欧 | 2016-07-21 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor changes. cannot assume hostname unchanged | ||
| | | | | * | | | | | | | | | | | | | | wrap long lines; | Stanley Cheung | 2016-07-20 |
| | | | | | | | | | | | | | | | | | | | |||
| | | | | * | | | | | | | | | | | | | | minor changes. cannot assume hostname unchanged | Stanley Cheung | 2016-07-20 |
| | | | |/ / / / / / / / / / / / / / | |||
| | | | * | | | | | | | | | | | | | | support php7 by marco | thinkerou | 2016-07-20 |
| | | | | | | | | | | | | | | | | | | |||
| | | | | | | * | | | | | | | | | | | Makefile modifications and instructions to enable cross-compilation | Vijay Pai | 2016-07-19 |
| | | | | | | | | | | | | | | | | | |