Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #6915 from markdroth/filter_api | 2016-08-05 | |
|\ | |||
* \ | Merge pull request #7625 from thunderboltsid/python-test-fix | 2016-08-05 | |
|\ \ | |||
* \ \ | Merge pull request #7653 from nicolasnoble/fix-interop-go | 2016-08-05 | |
|\ \ \ | |||
| * | | | Reducing diff. | 2016-08-05 | |
| * | | | That won't work properly. Falling back on fixing the list of dependencies. | 2016-08-05 | |
| * | | | Using the interop dependencies instead. | 2016-08-05 | |
| * | | | Hopefully fixing #7639. | 2016-08-05 | |
|/ / / | |||
* | | | Merge pull request #7447 from nicolasnoble/interop_server_split | 2016-08-04 | |
|\ \ \ | |||
| * | | | Forgot one file | 2016-08-04 | |
| * | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-04 | |
| |\ \ \ | |/ / / |/| | | | |||
* | | | | Merge pull request #7626 from nicolasnoble/manual-upmerge-after-version-bump | 2016-08-03 | |
|\ \ \ \ | |||
| | | * | | Fix the ThreadPoolExecutor: max_workers can't be 0 | 2016-08-03 | |
| |_|/ / |/| | | | |||
| * | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | 2016-08-03 | |
|/| | | | |||
| | | * | clang-format | 2016-08-03 | |
* | | | | Merge pull request #5803 from nicolasnoble/what-the-fuzz | 2016-08-03 | |
|\ \ \ \ | |||
| | * \ \ | Merge pull request #7572 from jcanizales/p0-4MB-should-be-more-than-enough-fo... | 2016-08-03 | |
| | |\ \ \ | |||
* | | \ \ \ | Merge pull request #7619 from dgquintas/fix_grpclbtest | 2016-08-03 | |
|\ \ \ \ \ \ | |||
| * | | | | | | regenerated projects | 2016-08-03 | |
| * | | | | | | deflake grpclb_test | 2016-08-02 | |
* | | | | | | | Merge pull request #7554 from muxi/fix-cronet-interop-test | 2016-08-02 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #7370 from rjshade/move_timeout_encoding | 2016-08-02 | |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #7254 from nicolasnoble/gcloud-no-image-aliases | 2016-08-02 | |
|\ \ \ \ \ \ \ \ | |||
| | | | | * \ \ \ | Merge pull request #7618 from dgquintas/v1.0.x | 2016-08-02 | |
| | | | | |\ \ \ \ | |||
| | | | | | * | | | | Merge pull request #7587 from dgquintas/install_docs | 2016-08-02 | |
| | | | | |/ / / / | |||
* | | | | | | | | | Merge pull request #7587 from dgquintas/install_docs | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | corrected typo | 2016-08-02 | |
| | | | | | | | | * | Update destroy_call_elem args from merge. | 2016-08-02 | |
| | | | | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into what-the-fuzz | 2016-08-02 | |
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
| | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into filter_api | 2016-08-02 | |
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #7520 from thunderboltsid/update-gitignore | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #7522 from makdharma/enable_secure_endpoint_trace | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7600 from dgquintas/fix_includes | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * \ \ \ | Merge pull request #7610 from kpayson64/downgrade_setuptools | 2016-08-02 | |
| | | | | | | | | | |\ \ \ \ | |||
* | | | | | | | | | | \ \ \ \ | Merge pull request #7024 from markdroth/filter_call_init_failure | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7601 from dgquintas/census_stuff | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | | * | | | | Downgrade docker setuptools | 2016-08-02 | |
| | | | | | | | | | | | | | | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-08-02 | |
| | | | | | | | | | | | | | | | |\ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | | | Fix destroy_call_elem API in test. | 2016-08-02 | |
* | | | | | | | | | | | | | | | | | Merge pull request #7590 from vjpai/affinity_optional | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | * | | | | | | | Fix Jenkins test error | 2016-08-02 | |
| | | | | | | | | | | | | | | | | * | Ran generate_projects.sh. | 2016-08-02 | |
| | | | | | | | | | | | | | | | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-08-02 | |
| | | | | | | | | | | | | | | | | |\ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | | | | Ran generate_projects.sh. | 2016-08-02 | |
| | | * | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | 2016-08-02 | |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #7603 from vitalybuka/stack-use-after-scope | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | Merge pull request #6924 from dgquintas/grpclb_v0 | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | | | | | | | * \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-02 | |
| | | | | | | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | Merge pull request #7575 from vjpai/make_stack_small_again | 2016-08-02 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | | | | | * \ \ \ \ | Merge pull request #7580 from jtattermusch/netcore_nuget_to_rtm | 2016-08-02 | |
| | | | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | |/| | | | |