aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'upstream/master' into cli_mainGravatar Yuchen Zeng2016-07-25
|\
* | Add header guardGravatar Yuchen Zeng2016-07-25
| |
| * Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_masterGravatar Nicolas Noble2016-07-25
| |\ | | | | | | V1.0.x merge into master
* | | Remove unnecessary dependenciesGravatar Yuchen Zeng2016-07-25
| | |
| * | Merge pull request #7020 from rjshade/assert_not_expectGravatar kpayson642016-07-25
| |\ \ | | | | | | | | ASSERT vector size before directly accessing first element
| * \ \ Merge pull request #7451 from y-zeng/seperate_generated_filesGravatar kpayson642016-07-25
| |\ \ \ | | | | | | | | | | Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf
* | | | | Command processing, validationGravatar Yuchen Zeng2016-07-25
| | | | |
| | | | * Rerun generate_projects.shGravatar murgatroid992016-07-25
| | | | |
| * | | | Merge pull request #7395 from markdroth/handshake_apiGravatar kpayson642016-07-25
| |\ \ \ \ | | | | | | | | | | | | General-purpose handshaker API.
| | | | | * Fix merge againGravatar murgatroid992016-07-25
| | | | | |
| * | | | | Merge pull request #7501 from dgquintas/phony_async_streamGravatar kpayson642016-07-25
|/| | | | | | | | | | | | | | | | | Removed unused version of async_stream.h
* | | | | | Merge pull request #7320 from yang-g/shut_down_acceptor_earlyGravatar Nicolas Noble2016-07-22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Shutdown the listeners early when destroying the tcp_server
* \ \ \ \ \ \ Merge pull request #7510 from stanley-cheung/regenerate-template-filesGravatar Stanley Cheung2016-07-22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Regenerate template files
| | | | | | | * Fixed incorrect mergesGravatar murgatroid992016-07-22
| | | | | | | |
| * | | | | | | regenerate template filesGravatar Stanley Cheung2016-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
| | | | | | |/
| | * | | | / Removed unused version of async_stream.hGravatar David Garcia Quintas2016-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
| | | | | * | | | Rerun generate_projects.shGravatar Yuchen Zeng2016-07-21
| | | | | | | | |
| | | | | * | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_filesGravatar Yuchen Zeng2016-07-21
| | | | | |\ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
* | | | | | | | | 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
| | | | | | | * | | | | | | | clang-formatGravatar Mark D. Roth2016-07-21
| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_apiGravatar Mark D. Roth2016-07-21
| | | | | | | |\ \ \ \ \ \ \ \
* | | | | | | | \ \ \ \ \ \ \ \ 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