Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into merge-parse | 2016-08-18 | |
|\ | |||
| * | Merge pull request #7741 from nicolasnoble/manual-upmerge | 2016-08-18 | |
| |\ | | | | | | | Manual upmerge from v1.0.x to master. | ||
| * \ | Merge pull request #7735 from y-zeng/cli_main_fork | 2016-08-17 | |
| |\ \ | | | | | | | | | Improve gRPC CLI | ||
| * \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | 2016-08-17 | |
| |\ \ \ | | | | | | | | | | | grpc thrift integration | ||
| | | | * | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | 2016-08-16 | |
| | |_|/| | |/| | | | |||
| | | * | | Add CliCredentials, config_grpc_cli.h | 2016-08-15 | |
| | | | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' into cli_main_fork | 2016-08-15 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Remove use of verify-install target in Makefile | 2016-08-10 | |
| | | | | | |||
| | | | * | Remove warning about protobuf 3.0.0+ from the Makefile | 2016-08-10 | |
| | | | | | |||
* | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-09 | |
|\| | | | | |||
| * | | | | Merge pull request #6915 from markdroth/filter_api | 2016-08-05 | |
| |\ \ \ \ | | | | | | | | | | | | | Implement C++ API for defining channel filters. | ||
* | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-04 | |
|\| | | | | | |||
* | | | | | | generate projects | 2016-08-04 | |
| | | | | | | |||
* | | | | | | Merge github.com:grpc/grpc into grand-unified-closures | 2016-08-04 | |
|\ \ \ \ \ \ | |||
| | * \ \ \ \ | 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 | |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | | | |||
| | | | | | | | * | | | refine code and add README | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||
| | | | | | | | | * | | | thrift serializer | 2016-07-31 | |
| | | | |_|_|_|_|/ / / | | | |/| | | | | | | | |||
| | | | | | | | | | * | Bumping to 1.0.0-pre2. | 2016-07-29 | |
| | | | | | | | | | | | |||
| | | | | | | * | | | | 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. | ||
| | | | | | | | | | * | | Remove references to string_ref_helper | 2016-07-25 | |
| | | | | | | | | | | | | |||
| | | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into cli_main | 2016-07-25 | |
| | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||
| | | | | | | | * | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | 2016-07-25 | |
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | | | | | | | | | * | | Remove unnecessary dependencies | 2016-07-25 | |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | 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 | |
| | | | | | | | | |\ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |||
| | | | | | | | | | | * | | Command processing, validation | 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 github.com:grpc/grpc into grand-unified-closures | 2016-07-24 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
| | | | | | | * | | | | | 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 pull request #6737 from ctiller/delayed-write | 2016-07-19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay beginning most writes until we enter poll() | ||
| | | | | | | | | * | | | | Merge branch 'master' into move_timeout_encoding | 2016-07-19 | |
| | | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |