aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Upmerge from v1.6.x branch to masterGravatar David Garcia Quintas2017-09-18
|\
* \ Merge pull request #12615 from nathanielmanistaatgoogle/fix_with_metaclass_usageGravatar Nathaniel Manista2017-09-18
|\ \
| * | Fix a six.with_metaclass usage mistakeGravatar Nathaniel Manista2017-09-18
* | | Merge pull request #12602 from nathanielmanistaatgoogle/grpc_1_0_flagGravatar Nathaniel Manista2017-09-17
|\ \ \
| * | | Overhaul protoc_plugins._split_definitions_testGravatar Nathaniel Manista2017-09-16
* | | | Merge pull request #12603 from nathanielmanistaatgoogle/python_sanity_testGravatar Nathaniel Manista2017-09-16
|\ \ \ \
* \ \ \ \ Merge pull request #12339 from muxi/add-objc-call-deadlineGravatar Muxi Yan2017-09-16
|\ \ \ \ \
| | * | | | Tweak Python sanity testGravatar Nathaniel Manista2017-09-16
| * | | | | Fix timeout testGravatar Muxi Yan2017-09-16
* | | | | | Merge pull request #12269 from vjpai/race_issuesGravatar Nicolas Noble2017-09-15
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #12598 from muxi/fix-test-outputGravatar Muxi Yan2017-09-15
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #12592 from nathanielmanistaatgoogle/grpc_1_0_flagGravatar Nathaniel Manista2017-09-15
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Polish output moreGravatar Muxi Yan2017-09-15
| |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #12553 from jiangtaoli2016/tsi_exec_ctxGravatar David G. Quintas2017-09-15
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #12545 from yashykt/type_renameGravatar Yash Tibrewal2017-09-15
|\ \ \ \ \ \ \ \
| | | * | | | | | Clean up a few more uses of gRPC in _pb2.py filesGravatar Nathaniel Manista2017-09-15
| | | | * | | | | Construction of streams shouldn't require triggering async opsGravatar Vijay Pai2017-09-14
| |_|_|/ / / / / |/| | | | | | |
| | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into tsi_exec_ctxGravatar jiangtaoli20162017-09-14
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | | | * | | | Polish commentGravatar Muxi Yan2017-09-14
| * | | | | | | %s/current_pollable/current_pollable_objGravatar Yash Tibrewal2017-09-14
| * | | | | | | Reverting suffixes and changing field names insteadGravatar Yash Tibrewal2017-09-14
* | | | | | | | Merge pull request #12550 from nathanielmanistaatgoogle/commandsGravatar Nathaniel Manista2017-09-14
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #12551 from nathanielmanistaatgoogle/grpc_1_0_flagGravatar Nathaniel Manista2017-09-14
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #12565 from kpayson64/revert_lb_stuffGravatar kpayson642017-09-14
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge pull request #12496 from ZhouyihaiDing/ruby_php_extensionGravatar ZhouyihaiDing2017-09-14
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge pull request #12577 from ctiller/http_write_statsGravatar Craig Tiller2017-09-14
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| | | * | | | | | | | Fix merge issueGravatar Ken Payson2017-09-14
| | * | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into ruby_php_extensionGravatar ZhouyihaiDing2017-09-14
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #12517 from apolcyn/fix_service_config_choice_from_dns_wit...Gravatar apolcyn2017-09-14
|\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix errant changeGravatar Craig Tiller2017-09-14
| | | * | | | | | | | | add php extensionGravatar ZhouyihaiDing2017-09-14
| | * | | | | | | | | | Collect stats on why writes are initiatedGravatar Craig Tiller2017-09-14
| |/ / / / / / / / / / |/| | | | | | | | | |
| | | * | | | | | | | Merge branch 'master' into revert_lb_stuffGravatar Yash Tibrewal2017-09-14
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| | | | | | * | | | | Pass exec_ctx in TSI zero_copy_protector createGravatar jiangtaoli20162017-09-14
| |_|_|_|_|/ / / / / |/| | | | | | | | |
* | | | | | | | | | Revert "Allow SerializationTraits to use grpc::ByteBuffer rather than only gr...Gravatar Jan Tattermusch2017-09-14
* | | | | | | | | | Merge pull request #12532 from yashykt/ctocc4Gravatar Yash Tibrewal2017-09-14
|\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | Revert "Add fallback (use backends from resolver if can't reach balancer) to ...Gravatar Ken Payson2017-09-13
| | | | | |_|/ / / / | | | | |/| | | | |
* | | | | | | | | | Merge pull request #12555 from ctiller/gross-object-countsGravatar Craig Tiller2017-09-13
|\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merging master into ctocc4Gravatar Yash Tibrewal2017-09-13
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Count api object creationsGravatar Craig Tiller2017-09-13
* | | | | | | | | | | Merge pull request #12326 from AspirinSJL/bug_shutdownGravatar Juanli Shen2017-09-13
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #12214 from vjpai/cereal_eye_sirGravatar Vijay Pai2017-09-13
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #12519 from vjpai/stylinGravatar Vijay Pai2017-09-13
|\ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #12524 from vjpai/age_filterGravatar Vijay Pai2017-09-13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| | | | | | * | | | | | | | Merging with masterGravatar Yash Tibrewal2017-09-13
| | | | | | * | | | | | | | Removing forward declarationGravatar Yash Tibrewal2017-09-13
| | | | | | * | | | | | | | removing a completed TODO, removing forward declarations and rearranging code...Gravatar Yash Tibrewal2017-09-13
| | | | | | | | | * | | | | grpc_1_0 flag for gRPC Python Protoc Plug-InGravatar Nathaniel Manista2017-09-13
| | | | | | | | | | * | | | Kill (grpcio_tests/)commands.BuildProtoModulesGravatar Nathaniel Manista2017-09-13
| |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| | | | * | | | | | | | | Add refcount to subchannel_index.Gravatar Juanli Shen2017-09-13