aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into lb_policy_name_channel_argGravatar Mark D. Roth2016-10-31
|\
| * Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-28
| |\
| * \ Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-27
| |\ \
| | | * Merge github.com:grpc/grpc into buffer_pools_for_realsiesGravatar Craig Tiller2016-10-26
| | | |\ | | | |/ | | |/|
* | / | Add ChannelArguments::SetLoadBalancingPolicyName() to C++ API.Gravatar Mark D. Roth2016-10-26
| |/ / |/| |
* | | Merge remote-tracking branch 'upstream/master' into resolver_channel_argsGravatar Mark D. Roth2016-10-26
|\ \ \
| * \ \ Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-25
| |\ \ \
| | | * \ Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-24
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge pull request #8281 from gcasto/cronet_cpp_apiGravatar Yang Gao2016-10-24
| | |\ \ \
| | | | * | clang format issuesGravatar Sree Kuchibhotla2016-10-24
| | | | * | Move thread_manager.h header from server.h to server_cc.ccGravatar Sree Kuchibhotla2016-10-24
| * | | | | Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-21
| |\| | | |
* | | | | | Merge remote-tracking branch 'upstream/master' into resolver_channel_argsGravatar Mark D. Roth2016-10-21
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| | | | * | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-21
| | | | |\ \ | | |_|_|/ / | |/| | | |
| | | | | * s/BUFFER_POOL/RESOURCE_QUOTA/gGravatar Craig Tiller2016-10-21
* | | | | | Encode server name, LB policy name, and addresses in channel args.Gravatar Mark D. Roth2016-10-21
| | | | | * Merge github.com:grpc/grpc into buffer_pools_for_realsiesGravatar Craig Tiller2016-10-20
| | | | | |\ | | |_|_|_|/ | |/| | | |
| * | | | | Merge pull request #8365 from vjpai/fc_1dstreamGravatar Vijay Pai2016-10-20
| |\ \ \ \ \
| * | | | | | Remove a useless forward declarationGravatar Vijay Pai2016-10-20
|/ / / / / /
| * | | | | Merge branch 'master' into fc_1dstreamGravatar Vijay Pai2016-10-20
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| | | | * | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-19
| | | | |\ \ | |_|_|_|/ / |/| | | | |
| | * | | | Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-19
| | |\ \ \ \ | |_|/ / / / |/| | | | |
| | | | | * Merge github.com:grpc/grpc into buffer_pools_for_realsiesGravatar Craig Tiller2016-10-19
| | | | | |\ | |_|_|_|_|/ |/| | | | |
| | * | | | Merge branch 'master' into uv_core_transportGravatar murgatroid992016-10-19
| | |\ \ \ \
| | | | | | * Merge github.com:grpc/grpc into buffer_pools_for_realsiesGravatar Craig Tiller2016-10-19
| | | | | | |\ | | | | |_|_|/ | | | |/| | |
| | | | | * | Rename sync_methods_ to sync_requests_Gravatar Sree Kuchibhotla2016-10-19
| | | | | * | Address code review commentsGravatar Sree Kuchibhotla2016-10-18
| | | | | | * Header fixesGravatar Craig Tiller2016-10-18
| | | | | * | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-18
| | | | | |\ \ | | | | |_|/ / | | | |/| | |
| * | | | | | Merge remote-tracking branch 'upstream/master' into fc_1dstreamGravatar Vijay Pai2016-10-18
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | | | * | reorder params in ServerGravatar Sree Kuchibhotla2016-10-18
* | | | | | | Merge remote-tracking branch 'upstream/master' into service_configGravatar Mark D. Roth2016-10-18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #8371 from yang-g/server_context_spouseGravatar Yang Gao2016-10-18
| |\ \ \ \ \ \
| | | | | | | * BufferPool --> ResourceQuotaGravatar Craig Tiller2016-10-17
| | * | | | | | resolve review commentGravatar yang-g2016-10-17
| | | | | * | | Merge remote-tracking branch 'upstream/master' into cronet_cpp_apiGravatar Garrett Casto2016-10-17
| | | | | |\ \ \
| | * | | | | | | Add a test spouse for server contextGravatar yang-g2016-10-13
| | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Other golden fileGravatar Vijay Pai2016-10-13
| | | | | | * | Fix testGravatar Sree Kuchibhotla2016-10-13
| | | | | | * | Fix include filesGravatar Sree Kuchibhotla2016-10-13
| | | | | | * | Rename GrpcRpcManager -> ThreadManagerGravatar Sree Kuchibhotla2016-10-13
| | | * | | | | clang-formatGravatar Vijay Pai2016-10-13
| | | | | | * | Refactor SyncServerSettings codeGravatar Sree Kuchibhotla2016-10-13
| | | * | | | | Bug fix on failure conditionGravatar Vijay Pai2016-10-13
| | | | | | * | Merge branch 'master' into rpc_mgrGravatar Sree Kuchibhotla2016-10-13
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | |
| | | * | | | | Making split streaming testableGravatar Vijay Pai2016-10-13
| | | * | | | | Merge branch 'master' into fc_1dstreamGravatar Vijay Pai2016-10-13
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | | | | | * Merge branch 'direct-calls' into buffer_pools_for_realsiesGravatar Craig Tiller2016-10-10
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Clarifying commentGravatar Craig Tiller2016-10-10
| |/ / / / / /
| | | | | | * Merge branch 'direct-calls' into buffer_pools_for_realsiesGravatar Craig Tiller2016-10-10
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | |