Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-09-08 |
|\ | |||
* \ | Merge pull request #7774 from ctiller/percent-encoder | Craig Tiller | 2016-09-06 |
|\ \ | |||
* \ \ | Merge pull request #7848 from nicolasnoble/upmerge-from-v1.0.x | Nicolas Noble | 2016-09-06 |
|\ \ \ | |||
* \ \ \ | Merge pull request #7943 from markdroth/client_channel_cleanup | Mark D. Roth | 2016-09-01 |
|\ \ \ \ | |||
| * | | | | Move subchannel_call_holder code into client_channel module. | Mark D. Roth | 2016-08-31 |
* | | | | | add trace context proto | Alistair Veitch | 2016-08-31 |
|/ / / / | |||
| | | * | Merge pull request #7909 from nathanielmanistaatgoogle/example-authorization-... | kpayson64 | 2016-08-30 |
| | | |\ | |||
| | | * \ | Merge pull request #7806 from nathanielmanistaatgoogle/secure_channel-doc-string | kpayson64 | 2016-08-30 |
| | | |\ \ | |||
* | | | \ \ | Merge pull request #7839 from markdroth/rename_client_config | Mark D. Roth | 2016-08-29 |
|\ \ \ \ \ \ | |||
| | | | | | * | Lower-case example "Authorization" header name | Nathaniel Manista | 2016-08-29 |
| | | | | |/ | | | | |/| | |||
* | | | | | | Merge pull request #7831 from thunderboltsid/remove-skipif-pypy | Nicolas Noble | 2016-08-28 |
|\ \ \ \ \ \ | |||
| | | * | | | | Merge branch 'v1.0.x' into upmerge-from-v1.0.x | Nicolas "Pixel" Noble | 2016-08-24 |
| |_|/| | | | |/| | | |/ / | | | |/| | | |||
| * | | | | | remove skipIf from TypeSmokeTest (issue 7672) | siddharthshukla | 2016-08-23 |
| | * | | | | Rename grpc_client_config to grpc_resolver_result. | Mark D. Roth | 2016-08-22 |
| | | * | | | Remove unused imports in grpcio-tests | Masood Malekghassemi | 2016-08-22 |
| | | | | * | Python grpc.secure_channel doc string correction | Nathaniel Manista | 2016-08-20 |
| | | | |/ | | | |/| | |||
* | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | |||
| * | | | 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 |
| |\ \ \ | |||
| * | | | | Use templates for python version dependencies | Ken Payson | 2016-08-18 |
| | | | * | Percent encoding routines | Craig Tiller | 2016-08-18 |
| | | |/ | |||
| | * / | Removing pre2 flag. | Nicolas "Pixel" Noble | 2016-08-16 |
| |/ / | |||
* | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-16 |
|\ \ \ | |_|/ |/| | | |||
| | * | Merge pull request #7732 from kpayson64/python3_artifacts | kpayson64 | 2016-08-15 |
| |/| | |||
* | | | Merge pull request #7538 from thunderboltsid/pypy-experiments | kpayson64 | 2016-08-15 |
|\ \ \ | |||
* \ \ \ | Merge pull request #7668 from thunderboltsid/skip-test-for-pypy | kpayson64 | 2016-08-15 |
|\ \ \ \ | |||
| | | | * | Add Python3.5 artifact targets | Ken Payson | 2016-08-15 |
| | | * | | Merge pull request #7702 from nathanielmanistaatgoogle/distrib-interop-stress... | kpayson64 | 2016-08-15 |
| | | |\ \ | | | | |/ | | | |/| | |||
* | | | | | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-11 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | | | * | Migrate distrib, interop, and stress to GA API | Nathaniel Manista | 2016-08-11 |
| | * | | | skip test run if running with pypy | siddharthshukla | 2016-08-09 |
| | | * | | Switch init/shutdown: lib-wide -> per-object | siddharthshukla | 2016-08-05 |
| | |/ / | |||
* | / / | Fix the ThreadPoolExecutor: max_workers can't be 0 | siddharthshukla | 2016-08-03 |
| |/ / |/| | | |||
| * | | Bump python protobuf dependency to 3.0.0 | Ken Payson | 2016-08-03 |
| |/ | |||
* | | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
|\ \ | |||
* \ \ | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
|\ \ \ | |||
* \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
|\ \ \ \ | |||
| | | | * | Bumping to 1.0.0-pre2. | Nicolas "Pixel" Noble | 2016-07-29 |
| | | * | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #7497 from soltanmm/be-nicer | kpayson64 | 2016-07-25 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
| |\ \ \ \ \ | |||
| | * | | | | | Rerun generate_projects.sh | murgatroid99 | 2016-07-25 |
| | | * | | | | Be more intelligent about Cython in grpcio | Masood Malekghassemi | 2016-07-22 |
| | * | | | | | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| | | |||
| | | | * | | merge to upstream/master | Alistair Veitch | 2016-07-21 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | Fix cygrpc test | Ken Payson | 2016-07-21 |
| * | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | Mark D. Roth | 2016-07-20 |
| |\| | | | | |||
| | | * | | | Merge pull request #7374 from kpayson64/python_health_check_rename | kpayson64 | 2016-07-19 |
| | | |\ \ \ | |||
| | | | | | * | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-19 |
| | | | | | |\ | | | |_|_|_|/ | | |/| | | | | |||
| | | * | | | | Fixed name syntax error | Ken Payson | 2016-07-18 |