Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Downgrade docker setuptools | Ken Payson | 2016-08-01 |
* | Merge pull request #7517 from markdroth/handshake_api | kpayson64 | 2016-07-26 |
|\ | |||
* \ | Merge pull request #7527 from jskeet/nulllogger | kpayson64 | 2016-07-26 |
|\ \ | |||
* \ \ | Merge pull request #7498 from thinkerou/wrap_php7 | kpayson64 | 2016-07-26 |
|\ \ \ | |||
* \ \ \ | Merge pull request #7477 from yang-g/monotonic | kpayson64 | 2016-07-26 |
|\ \ \ \ | |||
| | | * | | Change the default logger to the NullLogger. | Jon Skeet | 2016-07-26 |
| |_|/ / |/| | | | |||
* | | | | Merge pull request #7511 from nicolasnoble/doc-typo | kpayson64 | 2016-07-25 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfile | kpayson64 | 2016-07-25 |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge pull request #7497 from soltanmm/be-nicer | kpayson64 | 2016-07-25 |
|\ \ \ \ \ \ | |||
* \ \ \ \ \ \ | Merge pull request #7518 from nicolasnoble/plugins-should-compile | Nicolas Noble | 2016-07-25 |
|\ \ \ \ \ \ \ | |||
| | | | | | * \ | Merge pull request #4 from stanley-cheung/wrap_php7 | 田欧 | 2016-07-26 |
| | | | | | |\ \ | |||
| | | | | | | * | | update copyright | Stanley Cheung | 2016-07-25 |
| | | | | | |/ / | |||
| | | | | | * | | Merge pull request #3 from stanley-cheung/wrap_php7 | 田欧 | 2016-07-26 |
| | | | | | |\ \ | |||
* | | | | | | \ \ | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
|\ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ | Merge pull request #7020 from rjshade/assert_not_expect | kpayson64 | 2016-07-25 |
|\ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * | clang-format | Mark D. Roth | 2016-07-25 |
| | | | | | * | | | | | | 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 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||
| | | | | | | | | * | 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 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | Fix merge again | murgatroid99 | 2016-07-25 |
* | | | | | | | | | | | Merge pull request #7501 from dgquintas/phony_async_stream | kpayson64 | 2016-07-25 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | * | | | | | 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 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | | | Fixing documentation typo. | Nicolas "Pixel" Noble | 2016-07-23 |
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge pull request #7510 from stanley-cheung/regenerate-template-files | Stanley Cheung | 2016-07-22 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | | | Be more intelligent about Cython in grpcio | Masood Malekghassemi | 2016-07-22 |
| | | | | | | * | | | | | 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 |
| |_|_|_|_|/| | | | | |/| | | | | | | | | | | |||
| | | | | | | | | | * | Add grpc_error parameter to handshaker callback. | Mark D. Roth | 2016-07-22 |
| | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||
* | | | | | | | | | | Merge pull request #7504 from stanley-cheung/php-update-package-xml | Stanley Cheung | 2016-07-21 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | * \ \ \ | Merge pull request #7503 from stanley-cheung/php-update-package-xml-v1_0 | 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 |
|/ / / / / / / / / / / | |||
| | | | | | | * | | | | 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 |
|\ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ | Merge pull request #7269 from y-zeng/cli_call | kpayson64 | 2016-07-21 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | * \ \ \ | Merge pull request #7491 from kpayson64/remote_linux_whl_artifacts | kpayson64 | 2016-07-21 |
| | | | | | | |\ \ \ \ | |||
| | | | | * | | | | | | | Rerun generate_projects.sh | Yuchen Zeng | 2016-07-21 |