aboutsummaryrefslogtreecommitdiffhomepage
path: root/grpc.gemspec
Commit message (Expand)AuthorAge
* Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmergeGravatar Nicolas "Pixel" Noble2016-08-16
|\
* \ Merge pull request #7370 from rjshade/move_timeout_encodingGravatar kpayson642016-08-02
|\ \
* \ \ Merge pull request #6774 from a-veitch/add_resourceGravatar kpayson642016-08-02
|\ \ \
* \ \ \ Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
|\ \ \ \
| | | | * Update ruby google-protobuf dependency to 3.0Gravatar murgatroid992016-07-29
| | | * | Merge branch 'master' into move_timeout_encodingGravatar Robbie Shade2016-07-26
| | | |\ \ | | |_|/ / | |/| | |
| | * | | merge to upstream/masterGravatar Alistair Veitch2016-07-21
| | |\ \ \ | | | | |/ | | | |/|
* | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-07-14
|\ \ \ \ \ | | |_|/ / | |/| | |
| | * | | Added handshaker.[ch] to build.yaml.Gravatar Mark D. Roth2016-07-14
| |/ / /
| | | * Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transportGravatar Robbie Shade2016-07-13
| | |/ | |/|
| * | Resolved merge conflicts with masterGravatar murgatroid992016-06-27
| |\ \
| | * \ Merge pull request #6973 from makdharma/network_status_changeGravatar Jan Tattermusch2016-06-27
| | |\ \
| | * \ \ Merge branch 'master' into epoll_changes_mergedGravatar Sree Kuchibhotla2016-06-21
| | |\ \ \
* | | \ \ \ Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-06-20
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| | | | * | more files after running build.yaml changes throughGravatar Makarand Dharmapurikar2016-06-20
| | |_|/ / | |/| | |
| | * | | Resolved merge conflicts with masterGravatar murgatroid992016-06-20
| | |\ \ \ | | |/ / / | |/| | |
| | | * | Merge branch 'master' into epoll_changesGravatar Sree Kuchibhotla2016-06-16
| | | |\ \
* | | | | | added missing grpclb.h dep in build.yamlGravatar David Garcia Quintas2016-06-15
* | | | | | gRPC LB policyGravatar David Garcia Quintas2016-06-15
| |_|_|/ / |/| | | |
| | * | | Allow disabling traces, add trace variables for pluck and timeout eventsGravatar murgatroid992016-06-15
| |/ / / |/| | |
| * | | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeoutGravatar Craig Tiller2016-06-15
| |\ \ \ | |/ / / |/| | |
* | | | Merge remote-tracking branch 'upstream/master' into base64_decodeGravatar Yuchen Zeng2016-06-09
|\ \ \ \
| | | * \ Merge branch 'master' into epoll_changesGravatar Sree Kuchibhotla2016-06-09
| | | |\ \ | | |_|/ / | |/| | |
| | * | | Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-09
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #6481 from dgquintas/compression_md_level_bisGravatar Jan Tattermusch2016-06-08
| |\ \ \ \
* | \ \ \ \ Merge remote-tracking branch 'upstream/master' into base64_decodeGravatar Yuchen Zeng2016-06-08
|\ \ \ \ \ \
| | | | | * \ Merge branch 'master' into epoll_changesGravatar Sree Kuchibhotla2016-06-08
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | |
| | | * | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bisGravatar David Garcia Quintas2016-06-07
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | implement support for adding external fd to serverGravatar Adam Michalik2016-06-07
| | * | | | | separate posix functionality to grpc_posix.hGravatar Adam Michalik2016-06-07
| |/ / / / /
| | | * | | Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-07
| | | |\ \ \ | | |_|/ / / | |/| | | |
| | | * | | Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-07
| | | |\ \ \
| | | | | | * merge to masterGravatar Alistair Veitch2016-06-07
| | | | | | |\ | | | | | |_|/ | | | | |/| |
| * | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagationGravatar David Garcia Quintas2016-06-06
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge pull request #6750 from makdharma/cronetGravatar Jan Tattermusch2016-06-06
| | |\ \ \ \ \
| | | | | | * \ Merge branch 'master' into epoll_changesGravatar Sree Kuchibhotla2016-06-06
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | |
| | | | | | * | Remove unused filesGravatar Sree Kuchibhotla2016-06-06
| | | | | * | | Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-06
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | | * | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bisGravatar David Garcia Quintas2016-06-03
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #6306 from y-zeng/win32_suffixGravatar Jan Tattermusch2016-06-03
| | |\ \ \ \ \ \
| | | | | | | | * initial implementation of resource handlingGravatar Alistair Veitch2016-06-02
| | * | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_hookGravatar David Garcia Quintas2016-06-02
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | | | * | | | incremental fix - removed cronet dependency from grpc_secureGravatar Makarand Dharmapurikar2016-06-01
| | | | | * | | | cronet build related changesGravatar Makarand Dharmapurikar2016-06-01
| | | | |/ / / / | | | |/| | | |
| | | | | | * | Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-01
| | | | | | |\ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | Merge pull request #6702 from a-veitch/add_protoGravatar Jan Tattermusch2016-06-01
| | | |\ \ \ \ \
| | | | | | | * \ Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-01
| | | | | | | |\ \ | | | | |_|_|_|/ / | | | |/| | | | |
| * | | | | | | | s/grpc_pops/grpc_polling_entityGravatar David Garcia Quintas2016-05-31
| | | | | * | | | Merge remote-tracking branch 'upstream/master' into baseGravatar Yuchen Zeng2016-05-31
| | | | | |\ \ \ \
| * | | | | \ \ \ \ Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagationGravatar David Garcia Quintas2016-05-31
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |