aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Rerun generate_projects.shGravatar murgatroid992016-07-25
|
* Fix merge againGravatar murgatroid992016-07-25
|
* Fixed incorrect mergesGravatar murgatroid992016-07-22
|
* Actually commit changes to tools/distrib/python/grpcio_tools/setup.pyGravatar murgatroid992016-07-22
|
* Merge v1.0.x into masterGravatar murgatroid992016-07-22
|\
* \ Merge pull request #7504 from stanley-cheung/php-update-package-xmlGravatar Stanley Cheung2016-07-21
|\ \ | | | | | | PHP: update package xml and composer.json
| | * Merge pull request #7503 from stanley-cheung/php-update-package-xml-v1_0Gravatar Stanley Cheung2016-07-21
| | |\ | | | | | | | | PHP: update package.xml and composer.json
| * | | php: update composer.jsonGravatar Stanley Cheung2016-07-21
| | | |
| * | | php: update package.xml to 1.0.0RC2Gravatar Stanley Cheung2016-07-21
|/ / /
| | * php: update composer.jsonGravatar Stanley Cheung2016-07-21
| | |
| | * php: update package.xml to 1.0.0RC2Gravatar Stanley Cheung2016-07-21
| |/
* | Merge pull request #7488 from ghemawat/slice_user_dataGravatar kpayson642016-07-21
|\ \ | | | | | | Add gpr_slice_new_with_user_data.
* \ \ Merge pull request #7269 from y-zeng/cli_callGravatar kpayson642016-07-21
|\ \ \ | | | | | | | | Support server reflection in CLI
| | | * Merge pull request #7491 from kpayson64/remote_linux_whl_artifactsGravatar kpayson642016-07-21
| | | |\ | | | | | | | | | | Remove non-manylinux linux .whl artifacts
* | | | \ Merge pull request #7486 from dgquintas/alive_typoGravatar kpayson642016-07-21
|\ \ \ \ \ | | | | | | | | | | | | fixed typo
| | | | * \ Merge pull request #7393 from y-zeng/example_makefileGravatar Nicolas Noble2016-07-21
| | | | |\ \ | | | | | | | | | | | | | | Enable server reflection in c++ examples
* | | | | \ \ Merge pull request #7296 from thinkerou/fix_origGravatar Nicolas Noble2016-07-21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix orig files for conflicting generated
| | | | | * \ \ Merge pull request #7495 from kpayson64/fix_cygrpc_testGravatar Nicolas Noble2016-07-21
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | Fix cygrpc test
| | | | | * \ \ \ Merge pull request #7494 from nicolasnoble/no_verbose_fixGravatar Nicolas Noble2016-07-21
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make default log verbosity ERROR, run tests with DEBUG
| | | | | | | * | | Fix cygrpc testGravatar Ken Payson2016-07-21
| | | | | | | | | |
| | | | | | * | | | Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fixGravatar Nicolas "Pixel" Noble2016-07-21
| | | | | | |\ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/run_tests/run_tests.py
| | | | | | | | | * Remove non-manylinux linux .whl artifactsGravatar Ken Payson2016-07-21
| | | | | | | | |/ | | | | | | | |/|
| | | | | * | | | Merge pull request #7400 from yang-g/ga_branch2Gravatar Nicolas Noble2016-07-21
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | Cherrypick #7319 into v1.0.x
* | | | | | \ \ \ \ Merge pull request #7489 from stanley-cheung/php-fix-minor-styleGravatar Stanley Cheung2016-07-21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | php: fix minor style discrepency
* \ \ \ \ \ \ \ \ \ \ Merge pull request #7476 from vjpai/enable_crossGravatar Nicolas Noble2016-07-21
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Makefile modifications and instructions to enable cross-compilation
| | | | | | | * \ \ \ \ Merge pull request #7462 from ctiller/backport-delayed-writeGravatar Nicolas Noble2016-07-21
| | | | | | | |\ \ \ \ \ | | | | | | | | |_|_|/ / | | | | | | | |/| | | | Backport delayed write into v1.0.x branch
* | | | | | | | | | | | Merge pull request #7469 from yang-g/proto_liteGravatar Nicolas Noble2016-07-21
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add a macro to support protobuf lite
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7465 from grpc/revert-6942-perf_html_reportGravatar kpayson642016-07-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Generate html report for perf tests"
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7490 from nicolasnoble/sanitize-masterGravatar Nicolas Noble2016-07-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanitizing master.
| * | | | | | | | | | | | | | Sanitizing master.Gravatar Nicolas "Pixel" Noble2016-07-21
|/ / / / / / / / / / / / / /
| | | | * / / / / / / / / / php: fix minor style discrepencyGravatar Stanley Cheung2016-07-21
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| | | | | | | | * | | | | Merge pull request #7487 from thinkerou/on_v1.0.x_support_php7Gravatar Stanley Cheung2016-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_marcoGravatar Stanley Cheung2016-07-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [support PHP7] control code by version of PHP macro
| | | | | | | | * | | | | | | Add gpr_slice_new_with_user_data.Gravatar Sanjay Ghemawat2016-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-improGravatar kpayson642016-07-21
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade virtualenv pip in Python docgen
| | | | | | | | | | * | | | | support php7 on v1.0.x branchGravatar thinkerou2016-07-21
| | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | Merge pull request #7480 from murgatroid99/node_tools_tarball_namesGravatar Nicolas Noble2016-07-20
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct shell scripting mistake in node package generation code
| | | | | | | | * \ \ \ \ \ \ \ Merge pull request #7470 from dgquintas/v1.0.xGravatar Nicolas Noble2016-07-20
| | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grpc_args doxygen docstrings
| | | | | | * | | | | | | | | | | fixed typoGravatar David Garcia Quintas2016-07-20
| |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | Upgrade virtualenv pip in Python docgenGravatar Masood Malekghassemi2016-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ignore the docgen-generated directories under doc/.
* | | | | | | | | | | | | | | | Merge pull request #7368 from muxi/cronet-e2eGravatar makdharma2016-07-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Establish Objective C end-to-end core test with Cronet
| | | | | | | * | | | | | | | | | Addressed review commentsGravatar Yuchen Zeng2016-07-20
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #7294 from dgquintas/lb_docs_updateGravatar David G. Quintas2016-07-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added LB diagram and some more detail
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7454 from dgquintas/tiny_comment_updateGravatar David G. Quintas2016-07-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated outdated comment about uchannels
| | | | | | | | | | | | * | | | | | | Correct shell scripting mistake in node package generation codeGravatar murgatroid992016-07-20
| | | | | | | | | | | |/ / / / / / / | | | | | | | | | | |/| | | | | | |
| | | | * | | | | | | | | | | | | | Merge pull request #1 from stanley-cheung/support_php7_by_marcoGravatar 田欧2016-07-21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minor changes. cannot assume hostname unchanged
| | | | | * | | | | | | | | | | | | | wrap long lines;Gravatar Stanley Cheung2016-07-20
| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | minor changes. cannot assume hostname unchangedGravatar Stanley Cheung2016-07-20
| | | | |/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | support php7 by marcoGravatar thinkerou2016-07-20
| | | | | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | | | Makefile modifications and instructions to enable cross-compilationGravatar Vijay Pai2016-07-19
| | | | | | | | | | | | | | | | | |