Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | | * | | | | | | | | | Fix merge again | 2016-07-25 | ||
* | | | | | | | | | | | | | Merge pull request #7501 from dgquintas/phony_async_stream | 2016-07-25 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | * | | | | | | | php: add php7 to jenkins basic and interop tests | 2016-07-23 | ||
| | | | | | | * | | | | | | | php: remove protobuf-php clone hack | 2016-07-22 | ||
| | | | | | | * | | | | | | | remove outdated php dockerfile dependency | 2016-07-22 | ||
| |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge pull request #7320 from yang-g/shut_down_acceptor_early | 2016-07-22 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | * | | | | | | Fixing documentation typo. | 2016-07-23 | ||
| |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge pull request #7510 from stanley-cheung/regenerate-template-files | 2016-07-22 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | | | | * | regenerated projects | 2016-07-22 | ||
| | | | | | | | * | | | | | | Be more intelligent about Cython in grpcio | 2016-07-22 | ||
| | | | | | | * | | | | | | | Fixed incorrect merges | 2016-07-22 | ||
| | | | | | | | | | | | | * | Added missing var initialization | 2016-07-22 | ||
| * | | | | | | | | | | | | | regenerate template files | 2016-07-22 | ||
|/ / / / / / / / / / / / / | ||||
| | | | | | | | | | | | * | Merge branch 'master' of github.com:grpc/grpc into cpp_compression_level | 2016-07-22 | ||
| | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | Actually commit changes to tools/distrib/python/grpcio_tools/setup.py | 2016-07-22 | ||
| | | | | | * | | | | | | | Merge v1.0.x into master | 2016-07-22 | ||
| |_|_|_|_|/| | | | | | | |/| | | | | | | | | | | | | ||||
| | | | | | | | | | * | | | Add grpc_error parameter to handshaker callback. | 2016-07-22 | ||
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | ||||
* | | | | | | | | | | | | Merge pull request #7504 from stanley-cheung/php-update-package-xml | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | * \ \ \ \ \ | Merge pull request #7503 from stanley-cheung/php-update-package-xml-v1_0 | 2016-07-21 | ||
| | | | | | | |\ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | php: update composer.json | 2016-07-21 | ||
| * | | | | | | | | | | | | | php: update package.xml to 1.0.0RC2 | 2016-07-21 | ||
|/ / / / / / / / / / / / / | ||||
| | | | | | | * | | | | | | php: update composer.json | 2016-07-21 | ||
| | | | | | | * | | | | | | php: update package.xml to 1.0.0RC2 | 2016-07-21 | ||
| | | | | | |/ / / / / / | ||||
| | | | | | | | | | | * | C++ Compression Level set properly | 2016-07-21 | ||
| | * | | | | | | | | | | Removed unused version of async_stream.h | 2016-07-21 | ||
| |/ / / / / / / / / / |/| | | | | | | | | | | ||||
| | | | | | | | * | | | use php7_wrapper to reduce dup-codes | 2016-07-22 | ||
* | | | | | | | | | | | Merge pull request #7488 from ghemawat/slice_user_data | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ | ||||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7269 from y-zeng/cli_call | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | ||||
| | | | | | | * | | | | | Merge pull request #7491 from kpayson64/remote_linux_whl_artifacts | 2016-07-21 | ||
| | | | | | | |\ \ \ \ \ | ||||
| | | | | * | | | | | | | | Rerun generate_projects.sh | 2016-07-21 | ||
| | | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | 2016-07-21 | ||
| | | | | |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge pull request #7486 from dgquintas/alive_typo | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | * \ \ \ \ \ | Merge pull request #7393 from y-zeng/example_makefile | 2016-07-21 | ||
| | | | | | | | |\ \ \ \ \ \ | ||||
* | | | | | | | | \ \ \ \ \ \ | Merge pull request #7296 from thinkerou/fix_orig | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | | Merge pull request #7495 from kpayson64/fix_cygrpc_test | 2016-07-21 | ||
| | | | | | | | | |\ \ \ \ \ \ | ||||
| | | | | | | | | * \ \ \ \ \ \ | Merge pull request #7494 from nicolasnoble/no_verbose_fix | 2016-07-21 | ||
| | | | | | | | | |\ \ \ \ \ \ \ | ||||
| | | | | | | | | | | * | | | | | | Fix cygrpc test | 2016-07-21 | ||
| | | | | | | | | | * | | | | | | | Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fix | 2016-07-21 | ||
| | | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | |/ / / / / / / | | | | | | | | | |/| | | | | | | | ||||
| | | | | | | | | | | | | * | | | | Remove non-manylinux linux .whl artifacts | 2016-07-21 | ||
| | | | | | | | | | | | |/ / / / | | | | | | | | | | | |/| | | | | ||||
| | | | | | | | | | | | | | * | | use php7_wrapper to reduce dup-codes | 2016-07-22 | ||
| | | | | | | | | * | | | | | | | Merge pull request #7400 from yang-g/ga_branch2 | 2016-07-21 | ||
| | | | | | | | | |\ \ \ \ \ \ \ | ||||
* | | | | | | | | | \ \ \ \ \ \ \ | Merge pull request #7489 from stanley-cheung/php-fix-minor-style | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | * | | | | | | | | | | | clang-format | 2016-07-21 | ||
| | | | | | | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | 2016-07-21 | ||
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ | ||||
* | | | | | | | \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7476 from vjpai/enable_cross | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | | | | | | | | * \ \ \ \ \ \ \ | Merge pull request #7462 from ctiller/backport-delayed-write | 2016-07-21 | ||
| | | | | | | | | | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | |_|_|/ / / / / | | | | | | | | | | | | |/| | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #7469 from yang-g/proto_lite | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7465 from grpc/revert-6942-perf_html_report | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #7490 from nicolasnoble/sanitize-master | 2016-07-21 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | Sanitizing master. | 2016-07-21 | ||
|/ / / / / / / / / / / / / / / / / / / / |