aboutsummaryrefslogtreecommitdiffhomepage
path: root/grpc.gemspec
Commit message (Expand)AuthorAge
* 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
| |\ \
| | | * 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
| | |\
* | | | 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 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
| | |\ \ \ \ \
| | * \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | | * | | | | | Revert "Remove legacy poller"Gravatar Craig Tiller2016-05-31
| | | |/ / / / / / | | |/| | | | | |
| | | | | | | | * Remove union { } data and epoll_hdr structures. Added ev_epoll_linuxGravatar Sree Kuchibhotla2016-05-31
| | | | | | | | * Base changes. Create ev_epoll_posix.{c,h} files by making a copy of ev_poll_a...Gravatar Sree Kuchibhotla2016-05-31
| | | |_|_|_|_|/ | | |/| | | | |
| | | | * | | | Merge branch 'master' into add_protoGravatar Alistair Veitch2016-05-24
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | | | | | * Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-05-24
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge github.com:grpc/grpc into test_affineGravatar Craig Tiller2016-05-23
| | |\ \ \ \ \ \
| | | | | * | | | end-to-end compilationGravatar Alistair Veitch2016-05-23
| | * | | | | | | Remove legacy pollerGravatar Craig Tiller2016-05-20
| | | |_|/ / / / | | |/| | | | |
| | | | * | | | Merge branch 'master' of github.com:grpc/grpc into lr_hookGravatar David Garcia Quintas2016-05-19
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into credentials_refactoringGravatar Julien Boeuf2016-05-18
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | | | | * | Merge branch 'compression_incoming_checks' into compression_md_level_bisGravatar David Garcia Quintas2016-05-18
| | | |_|_|/ / | | |/| | | |
| | | | | | * Move load_file into iomgrGravatar Craig Tiller2016-05-18
| * | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagationGravatar David Garcia Quintas2016-05-18
| |\| | | | |
| | | | | | * Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-05-13
| | | | | | |\ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge pull request #5456 from ctiller/cleaner-posix3Gravatar Jan Tattermusch2016-05-13
| | |\ \ \ \ \