Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-12 | ||
| |\| | ||||
| | * | Merge pull request #9026 from jtattermusch/protobuf_consistent_cmake | 2016-12-12 | ||
| | |\ | | | | | | | | | Make cmake protobuf building consistent with third_party/protobuf | |||
| | * | | Short deadlines: set Status on deadline | 2016-12-09 | ||
| | | | | ||||
| | * | | Merge remote-tracking branch 'upstream/master' into ↵ | 2016-12-09 | ||
| | |\ \ | | | | | | | | | | | | | | | | revert-8949-revert-8922-slice_cleanup | |||
* | | \ \ | Merge branch 'slice_interning' into metadata_filter | 2016-12-09 | ||
|\ \ \ \ \ | ||||
| * | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | 2016-12-09 | ||
| |\| | | | | ||||
| | * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-09 | ||
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||
| | | | | * | make protobuf building consistent | 2016-12-09 | ||
| | | | |/ | | | |/| | ||||
* | | | | | Merge branch 'slice_interning' into metadata_filter | 2016-12-06 | ||
|\ \ \ \ \ | ||||
| * \ \ \ \ | Merge branch 'slice_with_exec_ctx' into slice_interning | 2016-12-06 | ||
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | ||||
| | * | | | Fix build | 2016-12-06 | ||
| | | | | | ||||
| | | * | | Renamed google_benchmark submodule to benchmark | 2016-12-06 | ||
| | | | | | ||||
| | * | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-06 | ||
| | |\| | | ||||
| | | | * | Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" | 2016-12-05 | ||
| | | |/ | ||||
| | | * | Merge pull request #8949 from grpc/revert-8922-slice_cleanup | 2016-12-05 | ||
| | | |\ | | | | | | | | | | | Revert "Remove redundant includes from string.h and tmpfile.h" | |||
| | | * | | Revert "Renamed google_benchmark submodule to benchmark" | 2016-12-05 | ||
| | | | | | ||||
| | | | * | Revert "Remove redundant includes from string.h and tmpfile.h" | 2016-12-05 | ||
| | | |/ | ||||
| | | * | Merge pull request #8922 from sreecha/slice_cleanup | 2016-12-05 | ||
| | | |\ | | | | | | | | | | | Remove redundant includes from string.h and tmpfile.h | |||
| | | * \ | Merge pull request #8851 from dgquintas/rename_gbench | 2016-12-05 | ||
| | | |\ \ | | | | | | | | | | | | | Renamed google_benchmark submodule to benchmark | |||
| | | * | | | Use the same server code for both secure and insecure servers. | 2016-12-02 | ||
| | | | | | | ||||
| | | | | * | Temporarily enable gpr_slice_* functions to not break api compatibility | 2016-12-01 | ||
| | | | | | | ||||
| * | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | 2016-11-30 | ||
| |\| | | | | ||||
| | | * | | | Merge remote-tracking branch 'upstream/master' into security_handshaker2 | 2016-11-30 | ||
| | | |\ \ \ | | | | | |/ | | | | |/| | ||||
| | | * | | | Fixed build.yaml and ran generate_projects.sh. | 2016-11-29 | ||
| | | | | | | ||||
| | | * | | | Merge branch 'security_handshaker1' into security_handshaker2 | 2016-11-29 | ||
| | | |\ \ \ | ||||
| | | | | * | | Revert "Test credentials provider update" | 2016-11-29 | ||
| | | | |/ / | ||||
| | | | | * | Renamed google_benchmark submodule to benchmark | 2016-11-23 | ||
| | | | | | | ||||
| | | | * | | resolve dependency | 2016-11-23 | ||
| | | | |/ | ||||
* | | | | | Merge branch 'slice_with_exec_ctx' into eliminate_mdstr | 2016-11-18 | ||
|\ \ \ \ \ | | |/ / / | |/| | | | ||||
| * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-18 | ||
| |\ \ \ \ | | | |_|/ | | |/| | | ||||
| | | | * | Rename security handshaker files. | 2016-11-17 | ||
| | | | | | ||||
| | | | * | Use the same connector code for both secure and insecure clients. | 2016-11-17 | ||
| | | | | | ||||
| | * | | | Merge pull request #8617 from markdroth/service_config_json | 2016-11-17 | ||
| | |\ \ \ | | | | | | | | | | | | | Use JSON tree for service config channel arg. | |||
* | | \ \ \ | Merge branch 'slice_interning' into eliminate_mdstr | 2016-11-16 | ||
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||
| * | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | 2016-11-16 | ||
| |\| | | | | ||||
| | * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-16 | ||
| | |\| | | | ||||
| | | * | | | Merge github.com:grpc/grpc into bm_fullstack | 2016-11-16 | ||
| | | |\ \ \ | | | | | |/ | | | | |/| | ||||
| | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-16 | ||
| | | | | |\ | | | | | |/ | | | | |/| | ||||
| | | | * | | Merge pull request #8680 from ctiller/no_more_legacy | 2016-11-15 | ||
| | | | |\ \ | | | | | | | | | | | | | | | Remove legacy poller | |||
| | | | * \ \ | Merge remote-tracking branch 'upstream/master' into latency_in_final_info | 2016-11-14 | ||
| | | | |\ \ \ | ||||
| | | | | * \ \ | Merge pull request #8335 from y-zeng/tos | 2016-11-11 | ||
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | Add grpc_socket_mutator | |||
* | | | | | | | | | Progress towards mdstr elimination | 2016-11-10 | ||
|/ / / / / / / / | ||||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-10 | ||
| | | | | | | |\ | | | | | |_|_|/ | | | | |/| | | | ||||
* | | | | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | 2016-11-10 | ||
|\| | | | | | | | ||||
| * | | | | | | | Fix foward declaration duplication | 2016-11-10 | ||
| | | | | | | | | ||||
* | | | | | | | | First pass of slice interning facilities | 2016-11-10 | ||
|/ / / / / / / | ||||
| | | * / / / | regenerate projects | 2016-11-09 | ||
| |_|/ / / / |/| | | | | | ||||
| | * | | | | Merge remote-tracking branch 'upstream/master' into latency_in_final_info | 2016-11-09 | ||
| | |\ \ \ \ | |_|/ / / / |/| | | | | | ||||
| | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-08 | ||
| | | | | |\ | |_|_|_|_|/ |/| | | | | | ||||
* | | | | | | Merge pull request #8618 from markdroth/channel_info_api | 2016-11-08 | ||
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add API for getting arbitrary state back from a channel |