Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #7517 from markdroth/handshake_api | kpayson64 | 2016-07-26 |
|\ | | | | | Improve error handling in handshake API | ||
* \ | 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 | ||
| | | | | * | | update copyright | Stanley Cheung | 2016-07-25 |
| | | | | | | | |||
* | | | | | | | 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 #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 | ||
| | | | | | | | * | clang-format | Mark D. Roth | 2016-07-25 |
| | | | | | | | | | |||
| | | | | | | | * | Fix API of handshake_manager_add(). | Mark D. Roth | 2016-07-25 |
| | | | | | | | | | |||
| | | | | | | | * | Merge remote-tracking branch 'upstream/master' into handshake_api2 | Mark D. Roth | 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. | ||
| | | | | * | | | | | 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 |
| |_|_|_|_|/ / / / |/| | | | | | | | | |||
| | | | | * | | | | 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 |
| | | | | | | | | | |||
| | | | * | | | | | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
| |_|_|/| | | | | |/| | | | | | | | | |||
| | | | | | | | * | Add grpc_error parameter to handshaker callback. | Mark D. Roth | 2016-07-22 |
| | | |_|_|_|_|/ | | |/| | | | | | |||
* | | | | | | | | php: update composer.json | Stanley Cheung | 2016-07-21 |
| | | | | | | | | |||
| | | | * | | | | php: update composer.json | Stanley Cheung | 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 remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-21 |
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||
| | | | | * | | | Merge pull request #7495 from kpayson64/fix_cygrpc_test | Nicolas Noble | 2016-07-21 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | Fix cygrpc test | ||
| | | | | | * | | | 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 | ||
| | | | | | | | | * | use php7_wrapper to reduce dup-codes | thinkerou | 2016-07-22 |
| | | | | | | | | | | |||
| | | | | | * | | | | 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 | ||
| | | | * | | | | | | | | 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 #7462 from ctiller/backport-delayed-write | Nicolas Noble | 2016-07-21 |
| | | | | | | |\ \ \ \ \ | | | | | | | | |_|/ / / | | | | | | | |/| | | | | Backport delayed write into v1.0.x branch | ||
* | | | | | | | | | | | | 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. | ||
| | | * | | | | | | | | clang-format | Mark D. Roth | 2016-07-21 |
| | | | | | | | | | | | |||
| | | | | | | * | | | | support php7 on v1.0.x branch | thinkerou | 2016-07-21 |
| | | | | | | | | | | | |||
| | | | * | | | | | | | Use compiling instead of making | Yuchen Zeng | 2016-07-20 |
| | | | | | | | | | | | |||
* | | | | | | | | | | | Merge pull request #7368 from muxi/cronet-e2e | makdharma | 2016-07-20 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Establish Objective C end-to-end core test with Cronet | ||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7454 from dgquintas/tiny_comment_update | David G. Quintas | 2016-07-20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated outdated comment about uchannels | ||
| | | * | | | | | | | | | | wrap long lines; | Stanley Cheung | 2016-07-20 |
| | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | minor changes. cannot assume hostname unchanged | Stanley Cheung | 2016-07-20 |
| | | | | | | | | | | | | |