Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
|\ | | | | | Add Census resource API and implementation. | ||
* \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
|\ \ | |||
| | * | merge to upstream/master | 2016-07-21 | |
| | |\ | |||
* | | \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-07-14 | |
|\ \ \ \ | | |_|/ | |/| | | |||
| | * | | Added handshaker.[ch] to build.yaml. | 2016-07-14 | |
| |/ / | |||
| * | | Resolved merge conflicts with master | 2016-06-27 | |
| |\ \ | |||
| | * \ | Merge pull request #6973 from makdharma/network_status_change | 2016-06-27 | |
| | |\ \ | | | | | | | | | | | Network status tracking | ||
| | * \ \ | Merge branch 'master' into epoll_changes_merged | 2016-06-21 | |
| | |\ \ \ | |||
* | | \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-06-20 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | | | * | | more files after running build.yaml changes through | 2016-06-20 | |
| | |_|/ / | |/| | | | |||
| | * | | | Resolved merge conflicts with master | 2016-06-20 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | Merge branch 'master' into epoll_changes | 2016-06-16 | |
| | | |\ \ | |||
* | | | | | | added missing grpclb.h dep in build.yaml | 2016-06-15 | |
| | | | | | | |||
* | | | | | | gRPC LB policy | 2016-06-15 | |
| |_|_|/ / |/| | | | | |||
| | * | | | Allow disabling traces, add trace variables for pluck and timeout events | 2016-06-15 | |
| |/ / / |/| | | | |||
| * | | | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | 2016-06-15 | |
| |\ \ \ | |/ / / |/| | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into base64_decode | 2016-06-09 | |
|\ \ \ \ | |||
| | | * \ | Merge branch 'master' into epoll_changes | 2016-06-09 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into error | 2016-06-09 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #6481 from dgquintas/compression_md_level_bis | 2016-06-08 | |
| |\ \ \ \ | | | | | | | | | | | | | Allow servers to select compression level via initial MD & overall compression cleanup | ||
* | \ \ \ \ | Merge remote-tracking branch 'upstream/master' into base64_decode | 2016-06-08 | |
|\ \ \ \ \ \ | |||
| | | | | * \ | Merge branch 'master' into epoll_changes | 2016-06-08 | |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | 2016-06-07 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | * | | | | | implement support for adding external fd to server | 2016-06-07 | |
| | | | | | | | |||
| | * | | | | | separate posix functionality to grpc_posix.h | 2016-06-07 | |
| |/ / / / / | |||
| | | * | | | Merge github.com:grpc/grpc into error | 2016-06-07 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | | * | | | Merge github.com:grpc/grpc into error | 2016-06-07 | |
| | | |\ \ \ | |||
| | | | | | * | merge to master | 2016-06-07 | |
| | | | | | |\ | | | | | |_|/ | | | | |/| | | |||
| * | | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | 2016-06-06 | |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||
| | * | | | | | Merge pull request #6750 from makdharma/cronet | 2016-06-06 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | cronet build related changes to build.yaml, and added ifdef guard around objective_c cronet code. | ||
| | | | | | * \ | Merge branch 'master' into epoll_changes | 2016-06-06 | |
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | |||
| | | | | | * | | Remove unused files | 2016-06-06 | |
| | | | | | | | | |||
| | | | | * | | | Merge github.com:grpc/grpc into error | 2016-06-06 | |
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | |||
| | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | 2016-06-03 | |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | * | | | | | | Merge pull request #6306 from y-zeng/win32_suffix | 2016-06-03 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Change win32 file suffix | ||
| | | | | | | | * | initial implementation of resource handling | 2016-06-02 | |
| | | | | | | | | | |||
| | * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_hook | 2016-06-02 | |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||
| | | | | * | | | | incremental fix - removed cronet dependency from grpc_secure | 2016-06-01 | |
| | | | | | | | | | |||
| | | | | * | | | | cronet build related changes | 2016-06-01 | |
| | | | |/ / / / | | | |/| | | | | |||
| | | | | | * | | Merge github.com:grpc/grpc into error | 2016-06-01 | |
| | | | | | |\ \ | | | | |_|_|/ / | | | |/| | | | | |||
| | | * | | | | | Merge pull request #6702 from a-veitch/add_proto | 2016-06-01 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add census protos. | ||
| | | | | | | * \ | Merge github.com:grpc/grpc into error | 2016-06-01 | |
| | | | | | | |\ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||
| * | | | | | | | | s/grpc_pops/grpc_polling_entity | 2016-05-31 | |
| | | | | | | | | | |||
| | | | | * | | | | Merge remote-tracking branch 'upstream/master' into base | 2016-05-31 | |
| | | | | |\ \ \ \ | |||
| * | | | | \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | 2016-05-31 | |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| | | | * | | | | | | Revert "Remove legacy poller" | 2016-05-31 | |
| | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d88e15cee750cd647a900098d82f87cc25aa8dbe. | ||
| | | | | | | | * | Remove union { } data and epoll_hdr structures. Added ev_epoll_linux | 2016-05-31 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files | ||
| | | | | | | | * | Base changes. Create ev_epoll_posix.{c,h} files by making a copy of ↵ | 2016-05-31 | |
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | ev_poll_and_epoll.c file | ||
| | | | * | | | | Merge branch 'master' into add_proto | 2016-05-24 | |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | | | | | | * | Merge github.com:grpc/grpc into error | 2016-05-24 | |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | |