Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-08-31 | ||
|\| | | | | | | | | | | ||||
| | | | * | | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-30 | ||
| | | | |\ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||
| | | | | * | | | | | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | 2016-08-30 | ||
| | | | | |\ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||
| * | | | | | | | | | | Merge pull request #7839 from markdroth/rename_client_config | 2016-08-29 | ||
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Rename grpc_client_config to grpc_resolver_result. | |||
| | | | | | | | * | | | | Initial code to move deadline timer into a filter. Timer cancellation | 2016-08-26 | ||
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not working right -- will fix in subsequent commit. | |||
| | | | | | | * | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | 2016-08-25 | ||
| | | | | | | |\ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | ||||
| | | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2016-08-24 | ||
| | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||
| | | | | | | * | | | | Add channel arg for max send message size and add message size filter. | 2016-08-23 | ||
| | | |_|_|_|/ / / / | | |/| | | | | | | | ||||
| | * | | | | | | | | Rename grpc_client_config to grpc_resolver_result. | 2016-08-22 | ||
| | | | | | | | | | | ||||
| | | | | | | | * | | Merge branch 'port_platform_split' into uv_core_transport | 2016-08-22 | ||
| | | |_|_|_|_|/| | | | |/| | | | | | | | ||||
| * | | | | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | 2016-08-20 | ||
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | / / / | | | |_|_|_|/ / / | | |/| | | | | | | ||||
| | | | | | | | * | Remove improper ifdef | 2016-08-19 | ||
| | | | | | | | | | ||||
| | | | | | | | * | Remove dependency on node c-ares | 2016-08-19 | ||
| | | | | | | | | | ||||
| | | | | | | | * | Add back native resolver | 2016-08-18 | ||
| | | | | | | | | | ||||
| | | | * | | | | | Percent encoding routines | 2016-08-18 | ||
| | | | | | | | | | ||||
| | | | | | | | * | Merge c-ares into libgrpc.a | 2016-08-17 | ||
| | | | | | | | | | ||||
| | * | | | | | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | 2016-08-17 | ||
| | | | | | | | | | ||||
| | | * | | | | | | Use thread pool from concurrent-ruby on ruby server | 2016-08-16 | ||
| | | |/ / / / / | ||||
| * | / / / / / | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | 2016-08-16 | ||
| |\| | | | | | | | |/ / / / / | |/| | | | | | ||||
| | | | | * | | Removed GPR_POSIX_FILE, and changed the files that used it | 2016-08-09 | ||
| | | | | | | | ||||
| | | | | * | | Separate out iomgr-specific constants into a separate header | 2016-08-08 | ||
| | | | | | | | ||||
| | | | | | * | Separate event driver from ares wrapper | 2016-08-08 | ||
| | | | | | | | ||||
| | | | | * | | refactor inet_ntop into a portability header | 2016-08-08 | ||
| | |_|_|/ / | |/| | | | | ||||
| | | | | * | Merge remote-tracking branch 'upstream/master' into cares | 2016-08-05 | ||
| | | | | |\ | | |_|_|_|/ | |/| | | | | ||||
| | | | | * | Implement c-ares based dns resolver | 2016-08-05 | ||
| | | | | | | ||||
* | | | | | | Merge branch 'handshaker_api' into http_connect | 2016-08-04 | ||
|\| | | | | | ||||
| | | * | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-04 | ||
| | | |\ \ \ | | |_|/ / / | |/| | | | | ||||
| * | | | | | Merge pull request #7370 from rjshade/move_timeout_encoding | 2016-08-02 | ||
| |\ \ \ \ \ | | | | | | | | | | | | | | | Move timeout_encoding to core/lib/transport | |||
* | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-08-02 | ||
|\| | | | | | | ||||
| * | | | | | | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | ||
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add Census resource API and implementation. | |||
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into http_connect | 2016-08-02 | ||
|\| | | | | | | | ||||
| | | | | | * | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | 2016-08-02 | ||
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | | ||||
| | | | | | * | | added gpr_types.h | 2016-08-01 | ||
| | | | | | | | | ||||
| * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | ||
| |\ \ \ \ \ \ \ | ||||
| | | | | * | | | | Update ruby google-protobuf dependency to 3.0 | 2016-07-29 | ||
| | | | | | | | | | ||||
| | | | | | | | * | Add c-ares in Makefile.template | 2016-07-28 | ||
| | | |_|_|_|_|/ | | |/| | | | | | ||||
| | | | | | | * | removed codegen/slice_buffer.h and scrubbed codegen/slice.h | 2016-07-27 | ||
| | | | | | | | | ||||
| | | | | | | * | removed codegen/log.h | 2016-07-27 | ||
| | | | | | | | | ||||
| | | | | | | * | removed codegen/time.h | 2016-07-27 | ||
| | | | | | | | | ||||
| | | | | | | * | removed codegen/byte_buffer.h | 2016-07-27 | ||
| | | | | | | | | ||||
| | | | | | | * | removed codegen/alloc.h | 2016-07-27 | ||
| | | |_|_|_|/ | | |/| | | | | ||||
| | | | * | | | Merge branch 'master' into move_timeout_encoding | 2016-07-26 | ||
| | | | |\ \ \ | | | |_|/ / / | | |/| | | | | ||||
* | / | | | | | Update build files. | 2016-07-22 | ||
| |/ / / / / |/| | | | | | ||||
| | * | | | | 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 | ||
| |/ / / / |/| | | | | ||||
| | | * | | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | 2016-07-13 | ||
| |_|/ / |/| | | | ||||
| | | * | Rename async_execution_lock --> combiner, make it use closures, unroll ↵ | 2016-07-07 | ||
| | | | | | | | | | | | | | | | | previous changes for idleness | |||
| | | * | Merge github.com:grpc/grpc into atm2 | 2016-07-07 | ||
| | | |\ | |_|_|/ |/| | | | ||||
* | | | | Resolved merge conflicts with master | 2016-06-27 | ||
|\ \ \ \ |