aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Merge branch 'grpclb_resolver_changes' into grpclb_resolver_changes2Gravatar Mark D. Roth2016-09-16
|\
| * Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changesGravatar Mark D. Roth2016-09-16
| |\
| * | Code review changes.Gravatar Mark D. Roth2016-09-16
| | * Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-clos...Gravatar Craig Tiller2016-09-16
| | |\
| | * \ Merge pull request #8112 from dgquintas/lb_proto_syncGravatar David G. Quintas2016-09-16
| | |\ \
* | | | | Fix bugs from merge.Gravatar Mark D. Roth2016-09-16
* | | | | clang-formatGravatar Mark D. Roth2016-09-16
* | | | | Merge branch 'grpclb_resolver_changes' into grpclb_resolver_changes2Gravatar Mark D. Roth2016-09-16
|\| | | |
| * | | | Bug fixes and cleanups.Gravatar Mark D. Roth2016-09-16
| * | | | clang-formatGravatar Mark D. Roth2016-09-16
| * | | | Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changesGravatar Mark D. Roth2016-09-16
| |\| | |
| * | | | Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changesGravatar Mark D. Roth2016-09-16
| |\ \ \ \
| | | * | | More gRPC LB bugfixes.Gravatar David Garcia Quintas2016-09-15
| | |/ / /
| | * | | Round Robin user_data fixGravatar David Garcia Quintas2016-09-15
| | | * | Synchronized tag number with that of authoritative copyGravatar David Garcia Quintas2016-09-15
| | |/ /
| | * | Merge pull request #7746 from dgquintas/lb_add_mdGravatar David G. Quintas2016-09-15
| | |\ \
| | * \ \ Merge pull request #8065 from kpayson64/cygrpc_importsGravatar kpayson642016-09-15
| | |\ \ \
* | | | | | Allow resolver to pass channel args to LB policy.Gravatar Mark D. Roth2016-09-15
| | | | * | Don't assert on use of unsupported user_data for LB policiesGravatar David Garcia Quintas2016-09-15
| | * | | | Merge pull request #8064 from kpayson64/cygrpc_remove_hardcodeGravatar kpayson642016-09-15
| | |\ \ \ \
| | | | | * | Fix commentGravatar David Garcia Quintas2016-09-15
| | | | | * | PR commentsGravatar David Garcia Quintas2016-09-15
| | * | | | | Merge pull request #8076 from jtattermusch/csharp_use_dotnetcli_nugetsGravatar Nicolas Noble2016-09-15
| | |\ \ \ \ \
| | | | | | * | More PR commentsGravatar David Garcia Quintas2016-09-14
| | * | | | | | Merge pull request #7980 from thinkerou/fix_time_posix_convGravatar Craig Tiller2016-09-14
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge pull request #7559 from dgquintas/codegen_cleanseGravatar Craig Tiller2016-09-13
| | |\ \ \ \ \ \ \
| | | | | | | | * | More PR comments.Gravatar David Garcia Quintas2016-09-13
| | | | | * | | | | make Grpc.Tools.nuspec buildable on LinuxGravatar Jan Tattermusch2016-09-13
| | * | | | | | | | Merge pull request #8059 from makdharma/cronet_onfailedGravatar makdharma2016-09-13
| | |\ \ \ \ \ \ \ \
* | | | | | | | | | | Merge branch 'grpclb_resolver_changes' into grpclb_resolver_changes2Gravatar Mark D. Roth2016-09-13
|\| | | | | | | | | |
| * | | | | | | | | | Switch to single-line comments.Gravatar Mark D. Roth2016-09-13
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into grpclb_resolver_changesGravatar Mark D. Roth2016-09-13
| |\| | | | | | | | |
| | | | | | * | | | | switch distribtests to use nugets generated by dotnet cliGravatar Jan Tattermusch2016-09-13
| | | |_|_|/ / / / / | | |/| | | | | | |
| | | | | | | | * | PR commentsGravatar David Garcia Quintas2016-09-12
| | | | | | | | * | Merge branch 'master' of github.com:grpc/grpc into lb_add_mdGravatar David Garcia Quintas2016-09-12
| | | | | | | | |\ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| | | | | | | | * | Moved LB token changes solely into grpclb.cGravatar David Garcia Quintas2016-09-12
| | | | | | | | | * Revert "Revert "Grand unified closures""Gravatar Craig Tiller2016-09-12
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Revert "Grand unified closures"Gravatar Craig Tiller2016-09-12
| | * | | | | | | Merge pull request #8048 from jtattermusch/dotnetcli_interoptestGravatar Jan Tattermusch2016-09-12
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #8047 from jtattermusch/coreclr_unloadingGravatar Jan Tattermusch2016-09-12
| | |\ \ \ \ \ \ \ \
| | | | | | | | * | | Load roots.pem relative to current fileGravatar Ken Payson2016-09-11
| | | | | | | | | * | Make .pxi imports relativeGravatar Ken Payson2016-09-11
| | | | | | | | |/ /
| | | | | * | | | | clang-formatGravatar Makarand Dharmapurikar2016-09-11
| | | | | * | | | | fixes to handle failed connectionsGravatar Makarand Dharmapurikar2016-09-11
* | | | | | | | | | Fix use-after-free bug.Gravatar Mark D. Roth2016-09-09
| | * | | | | | | | Fix bad mergeGravatar Craig Tiller2016-09-09
| | * | | | | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-09-09
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Merge pull request #8021 from hacfi/node_typoGravatar Michael Lumish2016-09-09
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge pull request #8039 from jtattermusch/dotnetcli_distribtest_prototypeGravatar Jan Tattermusch2016-09-09
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
* | | | | | | | | | | Avoid circular refcounting.Gravatar Mark D. Roth2016-09-09