Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Resolved merge conflicts with master | murgatroid99 | 2016-06-27 |
|\ | |||
| * | Merge pull request #6973 from makdharma/network_status_change | Jan Tattermusch | 2016-06-27 |
| |\ | |||
| * \ | Merge branch 'master' into epoll_changes_merged | Sree Kuchibhotla | 2016-06-21 |
| |\ \ | |||
| | | * | more files after running build.yaml changes through | Makarand Dharmapurikar | 2016-06-20 |
| | |/ | |||
* | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
|\ \ \ | | |/ | |/| | |||
| | * | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-16 |
| | |\ | |||
* | | | | Allow disabling traces, add trace variables for pluck and timeout events | murgatroid99 | 2016-06-15 |
| |_|/ |/| | | |||
| * | | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | Craig Tiller | 2016-06-15 |
| |\ \ | |/ / |/| | | |||
* | | | Merge remote-tracking branch 'upstream/master' into base64_decode | Yuchen Zeng | 2016-06-09 |
|\ \ \ | |||
| | | * | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-09 |
| | | |\ | | |_|/ | |/| | | |||
| | * | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-09 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #6481 from dgquintas/compression_md_level_bis | Jan Tattermusch | 2016-06-08 |
| |\ \ \ | |||
* | \ \ \ | Merge remote-tracking branch 'upstream/master' into base64_decode | Yuchen Zeng | 2016-06-08 |
|\ \ \ \ \ | |||
| | | | | * | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-08 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | * | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | David Garcia Quintas | 2016-06-07 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | implement support for adding external fd to server | Adam Michalik | 2016-06-07 |
| | * | | | | separate posix functionality to grpc_posix.h | Adam Michalik | 2016-06-07 |
| |/ / / / | |||
| | | * | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-07 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | * | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-07 |
| | | |\ \ | |||
| * | | \ \ | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-06-06 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | * | | | | Merge pull request #6750 from makdharma/cronet | Jan Tattermusch | 2016-06-06 |
| | |\ \ \ \ | |||
| | | | | | * | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-06 |
| | | | | | |\ | | | |_|_|_|/ | | |/| | | | | |||
| | | | | | * | Remove unused files | Sree Kuchibhotla | 2016-06-06 |
| | | | | * | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-06 |
| | | | | |\ \ | | | |_|_|/ / | | |/| | | | | |||
| | | | * | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | David Garcia Quintas | 2016-06-03 |
| | | | |\ \ \ | | | |_|/ / / | | |/| | | | | |||
| | * | | | | | Merge pull request #6306 from y-zeng/win32_suffix | Jan Tattermusch | 2016-06-03 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-06-02 |
| | |\ \ \ \ \ \ | |||
| | | | | * | | | | incremental fix - removed cronet dependency from grpc_secure | Makarand Dharmapurikar | 2016-06-01 |
| | | | | * | | | | cronet build related changes | Makarand Dharmapurikar | 2016-06-01 |
| | | | |/ / / / | | | |/| | | | | |||
| | | | | | * | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-01 |
| | | | | | |\ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | * | | | | | Merge pull request #6702 from a-veitch/add_proto | Jan Tattermusch | 2016-06-01 |
| | | |\ \ \ \ \ | |||
| | | | | | | * \ | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-01 |
| | | | | | | |\ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||
| * | | | | | | | | s/grpc_pops/grpc_polling_entity | David Garcia Quintas | 2016-05-31 |
| | | | | * | | | | Merge remote-tracking branch 'upstream/master' into base | Yuchen Zeng | 2016-05-31 |
| | | | | |\ \ \ \ | |||
| * | | | | \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-05-31 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| | | | * | | | | | | Revert "Remove legacy poller" | Craig Tiller | 2016-05-31 |
| | | |/ / / / / / | | |/| | | | | | | |||
| | | | | | | | * | Remove union { } data and epoll_hdr structures. Added ev_epoll_linux | Sree Kuchibhotla | 2016-05-31 |
| | | | | | | | * | Base changes. Create ev_epoll_posix.{c,h} files by making a copy of ev_poll_a... | Sree Kuchibhotla | 2016-05-31 |
| | | |_|_|_|_|/ | | |/| | | | | | |||
| | | | * | | | | Merge branch 'master' into add_proto | Alistair Veitch | 2016-05-24 |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | | | | | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-05-24 |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | | |||
| | * | | | | | | Merge github.com:grpc/grpc into test_affine | Craig Tiller | 2016-05-23 |
| | |\ \ \ \ \ \ | |||
| | | | | * | | | | end-to-end compilation | Alistair Veitch | 2016-05-23 |
| | * | | | | | | | Remove legacy poller | Craig Tiller | 2016-05-20 |
| | | |_|/ / / / | | |/| | | | | | |||
| | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-05-19 |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | | * | | | | | Merge branch 'master' of github.com:grpc/grpc into credentials_refactoring | Julien Boeuf | 2016-05-18 |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | | | | | * | | Merge branch 'compression_incoming_checks' into compression_md_level_bis | David Garcia Quintas | 2016-05-18 |
| | | |_|_|/ / | | |/| | | | | |||
| | | | | | * | Move load_file into iomgr | Craig Tiller | 2016-05-18 |
| * | | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-05-18 |
| |\| | | | | | |||
| | | | | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-05-13 |
| | | | | | |\ | | | |_|_|_|/ | | |/| | | | | |||
| | * | | | | | Merge pull request #5456 from ctiller/cleaner-posix3 | Jan Tattermusch | 2016-05-13 |
| | |\ \ \ \ \ |