Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #7527 from jskeet/nulllogger | kpayson64 | 2016-07-26 |
|\ | | | | | Change the default logger to the NullLogger. | ||
* \ | Merge pull request #7498 from thinkerou/wrap_php7 | kpayson64 | 2016-07-26 |
|\ \ | | | | | | | PHP: use php7_wrapper to reduce duplicated codes(first part) | ||
* \ \ | Merge pull request #7477 from yang-g/monotonic | kpayson64 | 2016-07-26 |
|\ \ \ | | | | | | | | | Convert deadline clock type in security handshake timer | ||
| | | * | Change the default logger to the NullLogger. | Jon Skeet | 2016-07-26 |
| |_|/ |/| | | | | | | | | | | | | | | It's unconventional for code to log to the console in .NET. Even now the logging is reduced, it's still present - especially in shutdown. This would fix #7361. | ||
* | | | Merge pull request #7511 from nicolasnoble/doc-typo | kpayson64 | 2016-07-25 |
|\ \ \ | | | | | | | | | Fixing documentation typo. | ||
* \ \ \ | Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfile | kpayson64 | 2016-07-25 |
|\ \ \ \ | | | | | | | | | | | PHP: add PHP7 to various Jenkins tests and update dockerfile | ||
* \ \ \ \ | Merge pull request #7497 from soltanmm/be-nicer | kpayson64 | 2016-07-25 |
|\ \ \ \ \ | | | | | | | | | | | | | Be more intelligent about Cython in grpcio | ||
* \ \ \ \ \ | Merge pull request #7518 from nicolasnoble/plugins-should-compile | Nicolas Noble | 2016-07-25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | We should always try to compile the protoc plugins when building tests. | ||
| | | | | | * | Merge pull request #4 from stanley-cheung/wrap_php7 | 田欧 | 2016-07-26 |
| | | | | | |\ | | | | | | | | | | | | | | | | | update copyright | ||
| | | | | | | * | update copyright | Stanley Cheung | 2016-07-25 |
| | | | | | |/ | |||
| | | | | | * | Merge pull request #3 from stanley-cheung/wrap_php7 | 田欧 | 2016-07-26 |
| | | | | | |\ | | | | | | | | | | | | | | | | | Add file to build.yaml (master) | ||
* | | | | | | \ | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | V1.0.x merge into master | ||
* \ \ \ \ \ \ \ \ | Merge pull request #7020 from rjshade/assert_not_expect | kpayson64 | 2016-07-25 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ASSERT vector size before directly accessing first element | ||
* \ \ \ \ \ \ \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf | ||
| | | | | | * | | | | | fix copyright | Stanley Cheung | 2016-07-25 |
| | | | | | | | | | | | |||
| | | | | | | | | | * | add file to build.yaml | Stanley Cheung | 2016-07-25 |
| | | | | | | | | |/ | |||
| | | | * | | | | / | We should always try to compile the protoc plugins when building tests. | 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 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | General-purpose handshaker API. | ||
| | | | * | | | | | | Fix merge again | murgatroid99 | 2016-07-25 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #7501 from dgquintas/phony_async_stream | kpayson64 | 2016-07-25 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Removed unused version of async_stream.h | ||
| | | | | | | * | | | | php: add php7 to jenkins basic and interop tests | Stanley Cheung | 2016-07-23 |
| | | | | | | | | | | | |||
| | | | | | | * | | | | php: remove protobuf-php clone hack | Stanley Cheung | 2016-07-22 |
| | | | | | | | | | | | |||
| | | | | | | * | | | | remove outdated php dockerfile dependency | Stanley Cheung | 2016-07-22 |
| |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #7320 from yang-g/shut_down_acceptor_early | Nicolas Noble | 2016-07-22 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Shutdown the listeners early when destroying the tcp_server | ||
| | | | | | | | * | | | Fixing documentation typo. | Nicolas "Pixel" Noble | 2016-07-23 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #7510 from stanley-cheung/regenerate-template-files | Stanley Cheung | 2016-07-22 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Regenerate template files | ||
| | | | | | | | * | | | Be more intelligent about Cython in grpcio | Masood Malekghassemi | 2016-07-22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before, Cython would *need* to be imported immediately if generated files did not already exist. Now, missing generated files will trigger a `setup_requires` inclusion of Cython and defer cythonization until extension build-time. If cythonization was specified via environment variable and setup could not find Cython, the extensions are poisoned instead of blocking non-extension commands from running. | ||
| | | | | | | * | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | | | | |/ / / / | |||
| | * | | | / / / / | Removed unused version of async_stream.h | David Garcia Quintas | 2016-07-21 |
| |/ / / / / / / / |/| | | | | | | | | |||
| | | | | | | | * | use php7_wrapper to reduce dup-codes | thinkerou | 2016-07-22 |
| | | | | | | | | | |||
* | | | | | | | | | 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 | ||
| | | | | * | | | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 |