Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #6915 from markdroth/filter_api | 2016-08-05 | |
|\ | | | | | Implement C++ API for defining channel filters. | ||
* \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-04 | |
|\ \ | |||
| * | | regenerated projects | 2016-08-03 | |
| | | | |||
| * | | 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 filter_api | 2016-08-02 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #6774 from a-veitch/add_resource | 2016-08-02 | |
| |\ \ \ | | | | | | | | | | | Add Census resource API and implementation. | ||
| | | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-08-02 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | 2016-08-02 | |
| |\ \ \ \ | |||
* | \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-08-02 | |
|\ \ \ \ \ \ | |||
| | | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | * | | | | regenerated projects | 2016-08-01 | |
| | | | | | | | |||
| * | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | 2016-08-01 | |
| |\ \ \ \ \ \ | |||
| | | | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-08-01 | |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
* | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-27 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | | | | * | | Merge branch 'master' into move_timeout_encoding | 2016-07-26 | |
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #7518 from nicolasnoble/plugins-should-compile | 2016-07-25 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | We should always try to compile the protoc plugins when building tests. | ||
* | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-25 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| * | | | | | | | | Merge pull request #7451 from y-zeng/seperate_generated_files | 2016-07-25 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf | ||
* | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-25 | |
|\| | | | | | | | | | |||
| | | * | | | | | | | We should always try to compile the protoc plugins when building tests. | 2016-07-25 | |
| | |/ / / / / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #7395 from markdroth/handshake_api | 2016-07-25 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | General-purpose handshaker API. | ||
| | | | | | | * \ \ | merge to upstream/master | 2016-07-21 | |
| | | | | | | |\ \ \ | |||
| * | | | | | | \ \ \ | Merge pull request #7269 from y-zeng/cli_call | 2016-07-21 | |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | Support server reflection in CLI | ||
| | | | * | | | | | | | Rerun generate_projects.sh | 2016-07-21 | |
| | | | | | | | | | | | |||
| | | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | 2016-07-21 | |
| | | | |\ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||
| | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | 2016-07-20 | |
| | | |\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | Makefile modifications and instructions to enable cross-compilation | 2016-07-19 | |
| | |_|/ / / / / / / / | |/| | | | | | | | | | |||
| | | | | | | | | * | | Merge branch 'master' into move_timeout_encoding | 2016-07-19 | |
| | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
* / | | | | | | | | | | Splitting interop_server.cc | 2016-07-18 | |
|/ / / / / / / / / / | |||
| | | * / / / / / / | Separate generated file and protobuf dependency | 2016-07-18 | |
| |_|/ / / / / / / |/| | | | | | | | | |||
| | | | | | | | * | Merge branch 'filter_call_init_failure' into filter_api | 2016-07-15 | |
| | | | | | | | |\ | | | | | |_|_|_|/ | | | | |/| | | | | |||
| | | | * | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | 2016-07-15 | |
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||
| | | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | 2016-07-14 | |
| | | | | |\ \ \ \ | |||
| | * | | | | | | | | Added handshaker.[ch] to build.yaml. | 2016-07-14 | |
| | | |_|_|/ / / / | | |/| | | | | | | |||
| | | * | | | | | | Simplified LR filter | 2016-07-13 | |
| | | | | | | | | | |||
| | | | | | | * | | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | 2016-07-13 | |
| | | |_|_|_|/ / | | |/| | | | | | |||
| | | | * | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failure | 2016-07-12 | |
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | | | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into filter_api | 2016-07-12 | |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | | |||
* | | | | | | | | Merge github.com:grpc/grpc into delayed-write | 2016-07-12 | |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Master is now 1.1.0-dev. | 2016-07-12 | |
| | | | | | | | | |||
| * | | | | | | | Flagging master as 1.0.0-pre1. | 2016-07-12 | |
| | | | | | | | | |||
| | | * | | | | | Merge remote-tracking branch 'origin/fix_tsan' into lr_july_16 | 2016-07-11 | |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Merge github.com:grpc/grpc into delayed-write | 2016-07-11 | |
|\ \ \ \ \ \ \ \ | |||
| | | | * | | | | | Added new features to load reporting. | 2016-07-10 | |
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Propagation of (rpc) method name. - Invocation of the hook at (call, channel) x (creation, destruction) - Added enum to identify the source of invocation. - Fixed testing. Went from test fixture to simple test. | ||
| | * | | | | | | Fix mac build | 2016-07-08 | |
| |/ / / / / / | |||
| | * | | | | | Support server reflection in CLI | 2016-07-07 | |
| | | | | | | | |||
* | | | | | | | Merge github.com:grpc/grpc into delayed-write | 2016-07-06 | |
|\ \ \ \ \ \ \ | |||
| | * | | | | | | Added missing dependencies to grpc++_base | 2016-07-06 | |
| |/ / / / / / | |||
| * | | | | | | Merge pull request #7210 from ctiller/no-more-zookeeper | 2016-07-01 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Expunge all references to zookeeper | ||
| * | | | | | | Merge pull request #6893 from y-zeng/handler_http_response | 2016-07-01 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add http2 status code in error_message if it's not 200 |