aboutsummaryrefslogtreecommitdiffhomepage
path: root/grpc.gemspec
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'google/v1.1.x'Gravatar Nicolas "Pixel" Noble2017-02-13
|\
| * build fixes for ruby on macGravatar Alexander Polcyn2017-02-09
* | Merge pull request #9371 from Vizerai/tracing_APIGravatar Jim King2017-02-08
|\ \
* | | Secure naming support for gRPCLBGravatar David Garcia Quintas2017-02-07
| | * also pick up latest version of google-protobufGravatar Alexander Polcyn2017-02-02
* | | Merge branch 'bm_countwrites' into bwestGravatar Craig Tiller2017-01-27
|\ \ \
| | * \ Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_APIGravatar Vizerai2017-01-27
| | |\ \ | | |/ / | |/| |
* | | | Merge github.com:grpc/grpc into bwestGravatar Craig Tiller2017-01-26
|\ \ \ \
| | | * \ Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_APIGravatar Vizerai2017-01-26
| | | |\ \ | | |_|/ / | |/| | |
| | * | | Merge branch 'cp' into rollfwdGravatar Craig Tiller2017-01-26
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #9372 from markdroth/proxy_mapperGravatar Mark D. Roth2017-01-25
| |\ \ \ \
| * \ \ \ \ Merge pull request #9383 from markdroth/http_connect_channel_argGravatar Mark D. Roth2017-01-25
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | | | * | Revert "Revert "Metadata handling rewrite""Gravatar Craig Tiller2017-01-23
| | |_|/ / | |/| | |
| * | | | Revert "Metadata handling rewrite"Gravatar Craig Tiller2017-01-20
| * | | | Merge pull request #9340 from stanley-cheung/update-boringsslGravatar Nicolas Noble2017-01-20
| |\ \ \ \
| | | | | * updateGravatar Vizerai2017-01-20
* | | | | | Merge github.com:grpc/grpc into bwestGravatar Craig Tiller2017-01-20
|\| | | | |
| | * | | | Update boringssl to latest chromium-stableGravatar Stanley Cheung2017-01-20
| | | |_|/ | | |/| |
| | | * | Move detection of HTTP CONNECT proxy from DNS resolver to client channel.Gravatar Mark D. Roth2017-01-18
| | |/ /
| * | | Merge github.com:grpc/grpc into metadata_filterGravatar Craig Tiller2017-01-17
| |\| |
| | | * Add proxy mapper hook.Gravatar Mark D. Roth2017-01-17
| | |/
| | * Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-r...Gravatar Mark D. Roth2017-01-13
| | |\
* | | \ Merge github.com:grpc/grpc into bwestGravatar Craig Tiller2017-01-13
|\ \ \ \ | | |_|/ | |/| |
| | * | Fix buildGravatar Craig Tiller2017-01-10
| | * | Merge github.com:grpc/grpc into fix_errorsGravatar Craig Tiller2017-01-09
| | |\ \ | | |/ / | |/| |
| | * | Start fixing http error --> grpc status conversionGravatar Craig Tiller2017-01-06
| * | | Handshaker plugin mechanism.Gravatar Mark D. Roth2017-01-06
| | | * Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-r...Gravatar Mark D. Roth2017-01-06
| | | |\ | | |_|/ | |/| |
| * | | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2017-01-04
| |\ \ \
| * \ \ \ Merge branch 'patchy' into slice_with_exec_ctx_and_buildGravatar Craig Tiller2017-01-04
| |\ \ \ \
| | * | | | Moving message_size_filter properly.Gravatar Nicolas "Pixel" Noble2017-01-04
| | |/ / /
* | | | | Merge branch 'flow_control_v2' into bwestGravatar Craig Tiller2016-12-27
|\ \ \ \ \ | | |/ / / | |/| | |
| | | * | Merge branch 'slice_with_exec_ctx' into metadata_filterGravatar Craig Tiller2016-12-27
| | | |\ \ | | | |/ / | | |/| |
| | * | | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-12-27
| | |\ \ \ | | |/ / / | |/| | |
| * | | | v1.0.x → master upmergeGravatar Nathaniel Manista2016-12-16
| |\ \ \ \
| | | | * \ Merge branch 'slice_with_exec_ctx' into metadata_filterGravatar Craig Tiller2016-12-12
| | | | |\ \ | | | | |/ / | | | |/| |
| | | * | | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-12-12
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | | | | * Revert "Revert "Revert "Revert "Remove redundant includes from string.h and t...Gravatar Mark D. Roth2016-12-12
| | |_|_|/ | |/| | |
| * | | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h"""Gravatar Craig Tiller2016-12-12
| | | * | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-12-12
| | | |\ \ | | |_|/ / | |/| | |
| | | | * Merge branch 'slice_interning' into metadata_filterGravatar Craig Tiller2016-12-06
| | | | |\
| | | | | * Merge branch 'slice_with_exec_ctx' into slice_interningGravatar Craig Tiller2016-12-06
| | | | | |\ | | | | |_|/ | | | |/| |
| | | * | | Fix buildGravatar Craig Tiller2016-12-06
| | | * | | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-12-06
| | | |\ \ \
| * | | | | | Revert "Revert "Remove redundant includes from string.h and tmpfile.h""Gravatar Mark D. Roth2016-12-05
| | |_|/ / / | |/| | | |
| * | | | | Revert "Remove redundant includes from string.h and tmpfile.h"Gravatar Mark D. Roth2016-12-05
| * | | | | Merge pull request #8922 from sreecha/slice_cleanupGravatar Mark D. Roth2016-12-05
| |\ \ \ \ \
| * | | | | | Use the same server code for both secure and insecure servers.Gravatar Mark D. Roth2016-12-02
| | * | | | | Temporarily enable gpr_slice_* functions to not break api compatibilityGravatar Sree Kuchibhotla2016-12-01
| | | * | | | update ruby protbuf dep to 3.1.0Gravatar Alex Polcyn2016-11-30