aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #6915 from markdroth/filter_apiGravatar kpayson642016-08-05
|\
* \ Merge pull request #7625 from thunderboltsid/python-test-fixGravatar kpayson642016-08-05
|\ \
* \ \ Merge pull request #7653 from nicolasnoble/fix-interop-goGravatar Nicolas Noble2016-08-05
|\ \ \
| * | | Reducing diff.Gravatar Nicolas "Pixel" Noble2016-08-05
| * | | That won't work properly. Falling back on fixing the list of dependencies.Gravatar Nicolas "Pixel" Noble2016-08-05
| * | | Using the interop dependencies instead.Gravatar Nicolas "Pixel" Noble2016-08-05
| * | | Hopefully fixing #7639.Gravatar Nicolas "Pixel" Noble2016-08-05
|/ / /
* | | Merge pull request #7447 from nicolasnoble/interop_server_splitGravatar Nicolas Noble2016-08-04
|\ \ \
| * | | Forgot one fileGravatar Nicolas "Pixel" Noble2016-08-04
| * | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-08-04
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #7626 from nicolasnoble/manual-upmerge-after-version-bumpGravatar Nicolas Noble2016-08-03
|\ \ \ \
| | | * | Fix the ThreadPoolExecutor: max_workers can't be 0Gravatar siddharthshukla2016-08-03
| |_|/ / |/| | |
| * | | Merge branch 'v1.0.x' of https://github.com/grpc/grpcGravatar Nicolas "Pixel" Noble2016-08-03
|/| | |
| | | * clang-formatGravatar Mark D. Roth2016-08-03
* | | | Merge pull request #5803 from nicolasnoble/what-the-fuzzGravatar Nicolas Noble2016-08-03
|\ \ \ \
| | * \ \ Merge pull request #7572 from jcanizales/p0-4MB-should-be-more-than-enough-fo...Gravatar Jorge Canizales2016-08-03
| | |\ \ \
* | | \ \ \ Merge pull request #7619 from dgquintas/fix_grpclbtestGravatar kpayson642016-08-03
|\ \ \ \ \ \
| * | | | | | regenerated projectsGravatar David Garcia Quintas2016-08-03
| * | | | | | deflake grpclb_testGravatar David Garcia Quintas2016-08-02
* | | | | | | Merge pull request #7554 from muxi/fix-cronet-interop-testGravatar Muxi Yan2016-08-02
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #7370 from rjshade/move_timeout_encodingGravatar kpayson642016-08-02
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #7254 from nicolasnoble/gcloud-no-image-aliasesGravatar Nicolas Noble2016-08-02
|\ \ \ \ \ \ \ \
| | | | | * \ \ \ Merge pull request #7618 from dgquintas/v1.0.xGravatar Nicolas Noble2016-08-02
| | | | | |\ \ \ \
| | | | | | * | | | Merge pull request #7587 from dgquintas/install_docsGravatar Nicolas Noble2016-08-02
| | | | | |/ / / /
* | | | | | | | | Merge pull request #7587 from dgquintas/install_docsGravatar Nicolas Noble2016-08-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | corrected typoGravatar David Garcia Quintas2016-08-02
| | | | | | | | | * Update destroy_call_elem args from merge.Gravatar Mark D. Roth2016-08-02
| | | | | * | | | | Merge branch 'master' of https://github.com/grpc/grpc into what-the-fuzzGravatar Nicolas "Pixel" Noble2016-08-02
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| | | | | | | | | * Merge remote-tracking branch 'upstream/master' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | | | | | | |\ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge pull request #7520 from thunderboltsid/update-gitignoreGravatar Nicolas Noble2016-08-02
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge pull request #7522 from makdharma/enable_secure_endpoint_traceGravatar Nicolas Noble2016-08-02
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7600 from dgquintas/fix_includesGravatar Nicolas Noble2016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6774 from a-veitch/add_resourceGravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | * \ \ \ Merge pull request #7610 from kpayson64/downgrade_setuptoolsGravatar kpayson642016-08-02
| | | | | | | | | | |\ \ \ \
* | | | | | | | | | | \ \ \ \ Merge pull request #7024 from markdroth/filter_call_init_failureGravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7601 from dgquintas/census_stuffGravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | Downgrade docker setuptoolsGravatar Ken Payson2016-08-02
| | | | | | | | | | | | | | | | * Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | | | | | | | | | | | | | |\ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fix destroy_call_elem API in test.Gravatar Mark D. Roth2016-08-02
* | | | | | | | | | | | | | | | | Merge pull request #7590 from vjpai/affinity_optionalGravatar Vijay Pai2016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | Fix Jenkins test errorGravatar Muxi Yan2016-08-02
| | | | | | | | | | | | | | | | | * Ran generate_projects.sh.Gravatar Mark D. Roth2016-08-02
| | | | | | | | | | | | | | | | | * Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | | | | | | | | | | | | | | |\ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Ran generate_projects.sh.Gravatar Mark D. Roth2016-08-02
| | | * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failureGravatar Mark D. Roth2016-08-02
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7603 from vitalybuka/stack-use-after-scopeGravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #6924 from dgquintas/grpclb_v0Gravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | * \ Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-08-02
| | | | | | | | | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge pull request #7575 from vjpai/make_stack_small_againGravatar Vijay Pai2016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ Merge pull request #7580 from jtattermusch/netcore_nuget_to_rtmGravatar Jan Tattermusch2016-08-02
| | | | | | | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | |/ / / / | | | | | | | | | | | | | | | | |/| | | |