Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | | | Merge branch 'master' into uv_core_transport | 2016-10-25 | ||
| |\ \ \ \ \ \ | ||||
| | | | * | | | | generate_projects.sh and also add config.h header so that gcc4.4 can ↵ | 2016-10-25 | ||
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recognize nullptr | |||
| | | | * | | | | Merge branch 'master' into rpc_mgr | 2016-10-24 | ||
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||
| | | | | * | | | Merge remote-tracking branch 'upstream/master' into reflection_header | 2016-10-24 | ||
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||
| | * | | | | | | Merge pull request #8281 from gcasto/cronet_cpp_api | 2016-10-24 | ||
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add C++ Api For Cronet | |||
* | | \ \ \ \ \ \ | Merge github.com:grpc/grpc into buffer_pools_for_realsies | 2016-10-24 | ||
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||
| | | | | | * | | | Merge remote-tracking branch 'upstream/master' into reflection_header | 2016-10-24 | ||
| | | | | | |\ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | ||||
| | | | | * | | | | Merge branch 'master' into rpc_mgr | 2016-10-24 | ||
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||
| | * | | | | | | | Merge branch 'master' into uv_core_transport | 2016-10-21 | ||
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||
| | | | * | | | | | Merge remote-tracking branch 'upstream/master' into resolver_channel_args | 2016-10-21 | ||
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | ||||
| | | | * | | | | | Remove resolver_result. | 2016-10-21 | ||
| | | | | | | | | | ||||
| | | | | | | * | | Add pid controller test | 2016-10-20 | ||
| | | | | |_|/ / | | | | |/| | | | ||||
| | | | | * | | | Merge branch 'master' into rpc_mgr | 2016-10-19 | ||
| | | | | |\ \ \ | | | | | |/ / / | | | | |/| | | | ||||
| | * | | | | | | Merge branch 'master' into uv_core_transport | 2016-10-19 | ||
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | ||||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into rename_client_config | 2016-10-19 | ||
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||
* | | | | | | | | Merge github.com:grpc/grpc into buffer_pools_for_realsies | 2016-10-19 | ||
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | ||||
| | | * | | | | | Merge branch 'master' into uv_core_transport | 2016-10-19 | ||
| | | |\ \ \ \ \ | ||||
| | | | | | | * \ | Merge remote-tracking branch 'upstream/master' into reflection_header | 2016-10-18 | ||
| | | | | | | |\ \ | | | | | |_|_|/ / | | | | |/| | | | | ||||
| | | | | | * | | | Merge branch 'master' into rpc_mgr | 2016-10-18 | ||
| | | | | | |\ \ \ | | | | | |_|/ / / | | | | |/| | | | | ||||
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into service_config | 2016-10-18 | ||
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | ||||
| | | | | | * | | | Merge branch 'master' into rpc_mgr | 2016-10-18 | ||
| | | | | | |\ \ \ | ||||
* | | | | | | | | | | BufferPool --> ResourceQuota | 2016-10-17 | ||
| | | | | | | | | | | ||||
* | | | | | | | | | | Merge branch 'direct-calls' into buffer_pools_for_realsies | 2016-10-17 | ||
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | ||||
| * | | | | | | | | | Merge github.com:grpc/grpc into direct-calls | 2016-10-17 | ||
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | | | ||||
| | | | | | | | * | | Remove generated pb files | 2016-10-14 | ||
| | | | | | | | | | | ||||
| | | * | | | | | | | Rename grpc_hash_table to grpc_mdstr_hash_table. | 2016-10-14 | ||
| | | | | | | | | | | ||||
| | | | | | | | | * | More interfaces for grpc_socket_mutator | 2016-10-13 | ||
| | | | | | | | | | | ||||
| | | | | | | * | | | Rename GrpcRpcManager -> ThreadManager | 2016-10-13 | ||
| | | | | | | | | | | ||||
| | * | | | | | | | | Moved cv polling into ev_poll_posix.c | 2016-10-13 | ||
| | | | | | | | | | | ||||
| | | | | | | | | * | Introduce grpc_socket_mutator | 2016-10-11 | ||
| | | | | | | | | | | ||||
| | | | | | | | | * | Add tos configuration in channel args | 2016-10-10 | ||
| | | | | | | | |/ | ||||
| | * | | | | | / | Add condition variable polling engine | 2016-10-10 | ||
| | | |_|_|_|_|/ | | |/| | | | | | ||||
| | | | | * | | | Merge branch 'master' into uv_core_transport | 2016-10-07 | ||
| | | | | |\ \ \ | | | |_|_|/ / / | | |/| | | | | | ||||
| | | | * | | | | Merge remote-tracking branch 'upstream/master' into rename_client_config | 2016-10-07 | ||
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||
| | | | | | * | | Add C++ Api | 2016-10-04 | ||
| | | |_|_|/ / | | |/| | | | | ||||
| | | * | | | | Merge remote-tracking branch 'upstream/master' into service_config | 2016-10-04 | ||
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | ||||
| | | | | | * | Merge branch 'master' into rpc_mgr | 2016-10-03 | ||
| | | | | | |\ | | | |_|_|_|/ | | |/| | | | | ||||
* | | | | | | | Merge branch 'direct-calls' into buffer_pools_for_realsies | 2016-10-03 | ||
|\| | | | | | | ||||
| * | | | | | | Merge github.com:grpc/grpc into direct-calls | 2016-10-03 | ||
| |\| | | | | | ||||
| | | | | * | | Merge branch 'master' into uv_core_transport | 2016-10-03 | ||
| | | | | |\ \ | ||||
| | | | | * | | | Compile and link core tests with libuv | 2016-10-03 | ||
| | | | | | | | | ||||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into rpc_mgr | 2016-10-03 | ||
| | | | | | | |\ | | | | | | | |/ | | | | | | |/| | ||||
| | | * | | | | | Merge remote-tracking branch 'upstream/master' into service_config | 2016-09-30 | ||
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | | | ||||
| | * | / | | | | PHP Proto3: run generate_projects.sh | 2016-09-29 | ||
| | | |/ / / / | | |/| | | | | ||||
* | | | | | | | Merge branch 'direct-calls' into buffer_pools_for_realsies | 2016-09-29 | ||
|\| | | | | | | ||||
| | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into ↵ | 2016-09-29 | ||
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | master-upmerge-from-deep-under | |||
| * | \ \ \ \ \ | Merge github.com:grpc/grpc into direct-calls | 2016-09-29 | ||
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | ||||
* | | | | | | | | Fix conflicting filename | 2016-09-28 | ||
| | | | | | | | | ||||
| | | * | | | | | Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under | 2016-09-29 | ||
| | | |\ \ \ \ \ | ||||
* | | | | | | | | | Buffer pool C++ wrapper | 2016-09-28 | ||
| | | | | | | | | |