Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
|\ | |||
* \ | Merge pull request #7254 from nicolasnoble/gcloud-no-image-aliases | Nicolas Noble | 2016-08-02 |
|\ \ | |||
* \ \ | Merge pull request #7600 from dgquintas/fix_includes | Nicolas Noble | 2016-08-02 |
|\ \ \ | |||
* \ \ \ | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #7024 from markdroth/filter_call_init_failure | kpayson64 | 2016-08-02 |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge pull request #7601 from dgquintas/census_stuff | kpayson64 | 2016-08-02 |
|\ \ \ \ \ \ | |||
| | * | | | | | Ran generate_projects.sh. | Mark D. Roth | 2016-08-02 |
| | * | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | Mark D. Roth | 2016-08-02 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
* | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
|\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge pull request #7602 from kpayson64/downgrade_setuptools.py | kpayson64 | 2016-08-01 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | Downgrade docker setuptools | Ken Payson | 2016-08-01 |
| | | * | | | | | | Changed census static metadata keys for tracing and tag propagation | David Garcia Quintas | 2016-08-01 |
| | |/ / / / / / | |/| | | | | | | |||
| | | | | * | | | fixed include guard script and faulty .h | David Garcia Quintas | 2016-08-01 |
| * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | David Garcia Quintas | 2016-08-01 |
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
* | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #7553 from podsvirov/topic-cmake-template | Nicolas Noble | 2016-07-29 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-07-29 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||
| | * | | | | | | | update to use new nuget client in tests | Alexander Polcyn | 2016-07-28 |
| | | * | | | | | | CMake: Installation and Export Configuration | Konstantin Podsvirov | 2016-07-28 |
| | |/ / / / / / | |/| | | | | | | |||
| | * | | | | | | regenerate from template | Stanley Cheung | 2016-07-26 |
| | * | | | | | | fix copyright | Stanley Cheung | 2016-07-26 |
| | * | | | | | | php: add php7 to jenkins basic and interop tests | Stanley Cheung | 2016-07-26 |
| | * | | | | | | php: remove protobuf-php clone hack | Stanley Cheung | 2016-07-26 |
| | * | | | | | | remove outdated php dockerfile dependency | Stanley Cheung | 2016-07-26 |
| | | | | | | * | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| * | | | | | | | Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfile | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | fix copyright | Stanley Cheung | 2016-07-25 |
| * | | | | | | | | | | Merge pull request #7395 from markdroth/handshake_api | kpayson64 | 2016-07-25 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | | Fix merge again | murgatroid99 | 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 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||
| | | | * | | | | | | | Fixed incorrect merges | murgatroid99 | 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 to upstream/master | Alistair Veitch | 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 |
| | | | | |\ \ \ \ \ \ | |||
| | | | * | \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-21 |
| | | | |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||
| | | | | * | | | | | | | Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fix | Nicolas "Pixel" Noble | 2016-07-21 |
| | | | | |\ \ \ \ \ \ \ | |||
| | | | | | | * | | | | | | Remove non-manylinux linux .whl artifacts | Ken Payson | 2016-07-21 |
| | | | | | * | | | | | | | Merge pull request #7462 from ctiller/backport-delayed-write | Nicolas Noble | 2016-07-21 |
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | | | |||
| * | | | | | | | | | | | | Merge pull request #7465 from grpc/revert-6942-perf_html_report | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | Mark D. Roth | 2016-07-21 |
| | | | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |||
| | | | | | | * | | | | | | | Merge pull request #7484 from soltanmm/docgen-impro | kpayson64 | 2016-07-21 |
| | | | | | | |\ \ \ \ \ \ \ | |||
| | | | | | | | * | | | | | | | Upgrade virtualenv pip in Python docgen | Masood Malekghassemi | 2016-07-20 |
| | | | | | | * | | | | | | | | Correct shell scripting mistake in node package generation code | murgatroid99 | 2016-07-20 |
| | | | | | | |/ / / / / / / | |||
| | | | * | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | Mark D. Roth | 2016-07-20 |
| | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | |