Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'pid++' into flow++ | Craig Tiller | 2017-10-18 |
|\ | |||
| * | Merge github.com:grpc/grpc into vector | Craig Tiller | 2017-10-16 |
| |\ | |||
* | | | flow control fixes | Craig Tiller | 2017-10-12 |
| |/ |/| | |||
| * | Merge github.com:grpc/grpc into vector | Craig Tiller | 2017-10-12 |
| |\ | |||
* | | | C++ize BDP estimator, introduce ManualConstructor | Craig Tiller | 2017-10-08 |
| |/ |/| | |||
* | | Fix merge | Craig Tiller | 2017-10-05 |
| | | |||
* | | Fix merge | Craig Tiller | 2017-10-05 |
| | | |||
| * | Merge github.com:grpc/grpc into vector | Craig Tiller | 2017-10-05 |
| |\ | |||
* | \ | Merge github.com:grpc/grpc into flowctl+millis | Craig Tiller | 2017-10-05 |
|\ \ \ | | |/ | |/| | |||
| | * | Add abseil to core, use it for InlinedVector | Craig Tiller | 2017-10-05 |
| | | | |||
| * | | Mirroring BUILD changes - missed public headers | Yash Tibrewal | 2017-10-05 |
| | | | |||
* | | | Merge github.com:grpc/grpc into flowctl+millis | Craig Tiller | 2017-10-05 |
|\ \ \ | | |/ | |/| | |||
| | * | Some final linker and build issues. Also, resolving invalid_channel_args_test | Yash Tibrewal | 2017-10-03 |
| | | | |||
| | * | Merge branch 'master' into externC | Yash Tibrewal | 2017-10-03 |
| | |\ | | |/ | |/| | |||
| | * | Few more BUILD file changes | Yash Tibrewal | 2017-10-03 |
| | | | |||
| * | | Update core version in BUILD file | murgatroid99 | 2017-10-02 |
| | | | |||
| * | | Update version to 1.8.0-dev, update g word to 'generous' | murgatroid99 | 2017-10-02 |
| | | | |||
| | * | Bazel build compilation language C++ | Yash Tibrewal | 2017-10-02 |
| | | | |||
| | * | Trying ken's fix for windows python | Yash Tibrewal | 2017-10-02 |
| | | | |||
| | * | Reverting socket_utils_windows.c till a fix for inet_ntop is found. Trying ↵ | Yash Tibrewal | 2017-10-02 |
| |/ | | | | | | | BUILD changes | ||
* | | Merge github.com:grpc/grpc into flowctl+millis | Craig Tiller | 2017-09-29 |
|\| | |||
| * | Merge pull request #12399 from muxi/fix-stream-compression-transport-duplicate | Muxi Yan | 2017-09-22 |
| |\ | | | | | | | Fix stream compression transport duplicate | ||
* | | | Merge github.com:grpc/grpc into flowctl+millis | Craig Tiller | 2017-09-22 |
|\| | | |||
| * | | Revert "Revert "Allow SerializationTraits to use grpc::ByteBuffer rather ↵ | Vijay Pai | 2017-09-21 |
| | | | | | | | | | | | | than only grpc_byte_buffer"" | ||
* | | | Merge github.com:grpc/grpc into grpc_millis | Craig Tiller | 2017-09-19 |
|\| | | |||
| | * | Merge remote-tracking branch 'upstream/master' into ↵ | Muxi Yan | 2017-09-19 |
| | |\ | | |/ | |/| | | | | fix-stream-compression-transport-duplicate | ||
| * | | Upmerge from v1.6.x branch to master | David Garcia Quintas | 2017-09-18 |
| |\ \ | |||
| * | | | Revert "Allow SerializationTraits to use grpc::ByteBuffer rather than only ↵ | Jan Tattermusch | 2017-09-14 |
| | | | | | | | | | | | | | | | | grpc_byte_buffer" | ||
| * | | | Merge pull request #12214 from vjpai/cereal_eye_sir | Vijay Pai | 2017-09-13 |
| |\ \ \ | | | | | | | | | | | Allow SerializationTraits to use grpc::ByteBuffer rather than only grpc_byte_buffer | ||
| | | * | | bump version to 1.6.1 | Jan Tattermusch | 2017-09-12 |
| | | | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' into ↵ | Muxi Yan | 2017-09-11 |
| | | | |\ | | |_|_|/ | |/| | | | | | | | | fix-stream-compression-transport-duplicate | ||
* | | | | | Merge | Craig Tiller | 2017-09-08 |
|\| | | | | |||
| * | | | | Merge pull request #12200 from dgquintas/rename_lr_to_plugin | David G. Quintas | 2017-09-08 |
| |\ \ \ \ | | | | | | | | | | | | | Renamed load_reporting.{c,h} to load_reporting_plugin.{c,h} | ||
| | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into rename_lr_to_plugin | David Garcia Quintas | 2017-09-07 |
| | |\ \ \ \ | |||
| | | | * | | | Allow SerializationTraits to use grpc::ByteBuffer, not just grpc_byte_buffer | Vijay Pai | 2017-09-07 |
| | | |/ / / | |||
| * | | | | | Merge github.com:grpc/grpc into stats_histo | Craig Tiller | 2017-09-07 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||
* | | | | | | Merge github.com:grpc/grpc into grpc_millis | Craig Tiller | 2017-09-07 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #12369 from markdroth/call_combiner | Mark D. Roth | 2017-09-07 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Second attempt at call combiner PR | ||
| | | * \ \ \ | Merge github.com:grpc/grpc into stats_histo | Craig Tiller | 2017-09-07 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Garbage collect experimental pollers | Craig Tiller | 2017-09-07 |
| | | | | | | | |||
| | | | | | * | fix bazel build | Muxi Yan | 2017-09-07 |
| | |_|_|_|/ | |/| | | | | |||
| | | | * | | s/load_reporting/server_load_reporting | David Garcia Quintas | 2017-09-06 |
| | | | | | | |||
| | | * | | | Update Bazel for new systems | Craig Tiller | 2017-09-06 |
| | |/ / / | |/| | | | |||
* | | | | | Merge github.com:grpc/grpc into wc | Craig Tiller | 2017-09-01 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Revert "Revert "Implement call combiner"" | Mark D. Roth | 2017-09-01 |
| |/ / / | | | | | | | | | | | | | This reverts commit bf19961d0a49b43cb528392efeb4880eeebb9b5e. | ||
| * | | | Merge github.com:grpc/grpc into stats | Craig Tiller | 2017-08-31 |
| |\ \ \ | |||
| | * | | | Revert "Implement call combiner" | Mark D. Roth | 2017-08-29 |
| | | | | | |||
| * | | | | Merge github.com:grpc/grpc into stats | Craig Tiller | 2017-08-29 |
| |\| | | | |||
* | | | | | Merge github.com:grpc/grpc into grpc_millis | Craig Tiller | 2017-08-29 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | | | * | 1.6.0-pre1 -> 1.6.0 | David Garcia Quintas | 2017-08-29 |
| | | | | |