Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'v1.0.x' into upmerge-from-v1.0.x | Nicolas "Pixel" Noble | 2016-08-24 |
|\ | |||
* \ | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | Nicolas Noble | 2016-08-23 |
|\ \ | | | | | | | Upmerge from v1.0.x | ||
| * | | Removing unused header. | Nicolas "Pixel" Noble | 2016-08-23 |
| | | | |||
| * | | Untangling secure and unsecure. | Nicolas "Pixel" Noble | 2016-08-23 |
| | | | |||
* | | | Merge pull request #7819 from stanley-cheung/php-update-composer | Stanley Cheung | 2016-08-23 |
|\ \ \ | | | | | | | | | PHP: bump version (master) | ||
| | | * | Merge pull request #7817 from stanley-cheung/php-update-composer-v1_0 | Stanley Cheung | 2016-08-23 |
| | | |\ | | | | | | | | | | | PHP: bump version | ||
* | | | \ | Merge pull request #7832 from thunderboltsid/add-readme-for-gsoc-contribs | Nicolas Noble | 2016-08-22 |
|\ \ \ \ \ | | | | | | | | | | | | | Add project overview for gsoc submission | ||
| | | | * \ | Merge pull request #7720 from apolcyn/update_examples_grpc_version | kpayson64 | 2016-08-22 |
| | | | |\ \ | | | | | | | | | | | | | | | update dependencies in C# examples to GA versions | ||
| | | | * \ \ | Merge pull request #7729 from apolcyn/update_to_sys_interactive | kpayson64 | 2016-08-22 |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | update to system interactive in distrib tests | ||
* | | | | \ \ \ | Merge pull request #7775 from vjpai/this | kpayson64 | 2016-08-22 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove this-> | ||
| | | | | * \ \ \ | Merge pull request #7805 from nathanielmanistaatgoogle/python-example-readmes | kpayson64 | 2016-08-22 |
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Truncate Python example READMEs to grpc.io links | ||
* | | | | | \ \ \ \ | Merge pull request #7763 from thunderboltsid/add-pypy-to-dockerfile | kpayson64 | 2016-08-22 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add PyPy 5.3.1 to dockerfile and template | ||
| | | | | | * \ \ \ \ | Merge pull request #7820 from soltanmm/impish-smile | kpayson64 | 2016-08-22 |
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused imports in grpcio-tests | ||
| | | * | | | | | | | | | Add project overview for gsoc submission | Siddharth Shukla | 2016-08-23 |
| | | | | | | | | | | | | |||
| | | | | | * | | | | | | Merge pull request #7826 from stanley-cheung/php-remove-ref-to-beta | Stanley Cheung | 2016-08-22 |
| | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP: remove reference to beta in INSTALL.md | ||
| | | | | | | * | | | | | | php: remove reference to beta in INSTALL.md | Stanley Cheung | 2016-08-22 |
| | | | | | |/ / / / / / | |||
| | | | | | * | | | | | | Merge pull request #7800 from apolcyn/dont_catch_load_error | Nicolas Noble | 2016-08-22 |
| | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont catch load error when loading grpc lib in ruby gem | ||
| | | | | | | | * | | | | | Remove unused imports in grpcio-tests | Masood Malekghassemi | 2016-08-22 |
| | | | | | | |/ / / / / | | | | | | |/| | | | | | |||
| | | | * | / | | | | | | php: bump version | Stanley Cheung | 2016-08-22 |
| |_|_|/ / / / / / / / |/| | | | | | | | | | | |||
| | | | | | | | | | * | php: bump version | Stanley Cheung | 2016-08-22 |
| | | | | | |_|_|_|/ | | | | | |/| | | | | |||
* | | | | | | | | | | Merge pull request #6732 from ctiller/consistent_client_count | Craig Tiller | 2016-08-22 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Make client_channels be across all clients, not per-client | ||
| | | | | | | * | | | | convert match data to string | Alexander Polcyn | 2016-08-20 |
| | | | | | | | | | | | |||
| | | | | | | | * | | | Truncate Python example READMEs to grpc.io links | Nathaniel Manista | 2016-08-20 |
| | | | | | | |/ / / | | | | | | |/| | | | |||
| | | | | | | * | | | fix directory check | Alexander Polcyn | 2016-08-19 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #7718 from adelez/build_stats | Nicolas Noble | 2016-08-19 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | | Tool for collecting build statistics. | ||
| | | | | * | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
| |_|_|_|/| | | | | |/| | | | |/ / / / | |||
| | | | | | * | | | dont catch load error when loading grpc lib in grpc gem | Alexander Polcyn | 2016-08-19 |
| | | | | | | | | | |||
| | | | | | * | | | Restoring require_relative. | Nicolas "Pixel" Noble | 2016-08-19 |
| | | | | | | | | | |||
| | | | | | * | | | Fixing loading precompiled Ruby extension on 2.x.10+ | Nicolas "Pixel" Noble | 2016-08-19 |
| | | | | | | | | | |||
| | | | | * | | | | Merge pull request #7783 from nicolasnoble/shipping-1.0 | Nicolas Noble | 2016-08-18 |
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Bumping version to 1.0.1-pre1. | ||
| | | | | * \ \ \ \ | Merge pull request #7787 from nicolasnoble/quick-fix-for-manylinux | Nicolas Noble | 2016-08-18 |
| | | | | |\ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | | | Disabling check for SO_REUSEPORT in MANYLINUX; it'll always fail. | ||
| | | | | | * | | | | Disabling check for SO_REUSEPORT in MANYLINUX; it'll always fail. | Nicolas "Pixel" Noble | 2016-08-19 |
| | | | | |/ / / / | |||
* | | | | | | | | | Merge pull request #7762 from KindDragon/master | Nicolas Noble | 2016-08-18 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix CMake for windows (VS2015) | ||
| | | | | | * \ \ \ | Merge pull request #7784 from jcanizales/move-to-v1 | Nicolas Noble | 2016-08-18 |
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Move Podspecs to v1 | ||
* | | | | | | \ \ \ \ | Merge pull request #7308 from ctiller/moovee | Nicolas Noble | 2016-08-18 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Prep for making GA video | ||
| | | | | | | | * | | | | Move user-agent version to 1.0.0 | Jorge Canizales | 2016-08-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can’t wait to get all of these automatically from a single source :) | ||
| | * | | | | | | | | | | Merge pull request #1 from nicolasnoble/cmake-fixes | Arkady Shapkin | 2016-08-19 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Generating project file. | ||
| | | * | | | | | | | | | | Generating project file. | Nicolas "Pixel" Noble | 2016-08-18 |
| | |/ / / / / / / / / / | |||
| | | | | | | | * / / / | Move Podspecs to v1 | Jorge Canizales | 2016-08-18 |
| | | | | | | |/ / / / | |||
| | | | | | | | * / / | Bumping version to 1.0.1-pre1. | Nicolas "Pixel" Noble | 2016-08-18 |
| | | | | | | |/ / / | |||
| | | | | | | * | | | Merge pull request #7745 from nicolasnoble/no-more-pre | Nicolas Noble | 2016-08-18 |
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | Removing pre2 flag. | ||
| | | | | | | * \ \ \ | Merge pull request #7776 from kpayson64/templatize_dependencies | Nicolas Noble | 2016-08-18 |
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Use templates for python version dependencies | ||
| | | | | | | | * | | | | Use templates for python version dependencies | Ken Payson | 2016-08-18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change grpcio-tools to be a runtime dependency of grpcio-tests, grpcio-tools is run as part of the tests. | ||
| | | | | | | * | | | | | Merge pull request #7752 from nicolasnoble/unsecure-should-be-unsecure | Nicolas Noble | 2016-08-18 |
| | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | ||
| | | | | | | * \ \ \ \ \ | Merge pull request #7744 from y-zeng/makefile-ga | Nicolas Noble | 2016-08-18 |
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update required protobuf version to v3.0.0 | ||
| | | | | | | * \ \ \ \ \ \ | Merge pull request #7754 from dgquintas/readme_beta_to_ga | Nicolas Noble | 2016-08-18 |
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | |_|_|/ / / / | | | | | | | |/| | | | | | | s/Beta/1.0 in languages status table | ||
| | | | | | * / | | | | | | | Remove this-> | Vijay Pai | 2016-08-18 |
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge pull request #7741 from nicolasnoble/manual-upmerge | Nicolas Noble | 2016-08-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual upmerge from v1.0.x to master. | ||
* \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7773 from markdroth/bytebuffer_alloc | Mark D. Roth | 2016-08-18 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce allocations associated with src/cpp/util/byte_buffer.cc. | ||
| * | | | | | | | | | | | | | | Reduce allocations associated with src/cpp/util/byte_buffer.cc. | Mark D. Roth | 2016-08-18 |
|/ / / / / / / / / / / / / / |