Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'slice_with_exec_ctx' into metadata_filter | Craig Tiller | 2016-12-12 |
|\ | |||
| * | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
| |\ | |||
| | * | Merge pull request #9062 from grpc/revert-9019-short_deadlines | Craig Tiller | 2016-12-12 |
| | |\ | | | | | | | | | Revert "Handle (and test) short call deadlines" | ||
| | * | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | Craig Tiller | 2016-12-12 |
| | | | | |||
| | | * | Revert "Handle (and test) short call deadlines" | Craig Tiller | 2016-12-12 |
| | |/ | |||
| * | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
| |\| | |||
| | * | Merge pull request #9026 from jtattermusch/protobuf_consistent_cmake | Jan Tattermusch | 2016-12-12 |
| | |\ | | | | | | | | | Make cmake protobuf building consistent with third_party/protobuf | ||
| | * | | Short deadlines: set Status on deadline | David Garcia Quintas | 2016-12-09 |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into ↵ | Mark D. Roth | 2016-12-09 |
| | |\ \ | | | | | | | | | | | | | | | | revert-8949-revert-8922-slice_cleanup | ||
* | | \ \ | Merge branch 'slice_interning' into metadata_filter | Craig Tiller | 2016-12-09 |
|\ \ \ \ \ | |||
| * | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-12-09 |
| |\| | | | | |||
| | * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-09 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||
| | | | | * | make protobuf building consistent | Jan Tattermusch | 2016-12-09 |
| | | | |/ | | | |/| | |||
* | | | | | Merge branch 'slice_interning' into metadata_filter | Craig Tiller | 2016-12-06 |
|\ \ \ \ \ | |||
| * \ \ \ \ | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-12-06 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||
| | * | | | Fix build | Craig Tiller | 2016-12-06 |
| | | | | | |||
| | | * | | Renamed google_benchmark submodule to benchmark | David Garcia Quintas | 2016-12-06 |
| | | | | | |||
| | * | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-06 |
| | |\| | | |||
| | | | * | Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" | Mark D. Roth | 2016-12-05 |
| | | |/ | |||
| | | * | Merge pull request #8949 from grpc/revert-8922-slice_cleanup | Mark D. Roth | 2016-12-05 |
| | | |\ | | | | | | | | | | | Revert "Remove redundant includes from string.h and tmpfile.h" | ||
| | | * | | Revert "Renamed google_benchmark submodule to benchmark" | Mark D. Roth | 2016-12-05 |
| | | | | | |||
| | | | * | Revert "Remove redundant includes from string.h and tmpfile.h" | Mark D. Roth | 2016-12-05 |
| | | |/ | |||
| | | * | Merge pull request #8922 from sreecha/slice_cleanup | Mark D. Roth | 2016-12-05 |
| | | |\ | | | | | | | | | | | Remove redundant includes from string.h and tmpfile.h | ||
| | | * \ | Merge pull request #8851 from dgquintas/rename_gbench | Mark D. Roth | 2016-12-05 |
| | | |\ \ | | | | | | | | | | | | | Renamed google_benchmark submodule to benchmark | ||
| | | * | | | Use the same server code for both secure and insecure servers. | Mark D. Roth | 2016-12-02 |
| | | | | | | |||
| | | | | * | Temporarily enable gpr_slice_* functions to not break api compatibility | Sree Kuchibhotla | 2016-12-01 |
| | | | | | | |||
| * | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-11-30 |
| |\| | | | | |||
| | | * | | | Merge remote-tracking branch 'upstream/master' into security_handshaker2 | Mark D. Roth | 2016-11-30 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||
| | | * | | | Fixed build.yaml and ran generate_projects.sh. | Mark D. Roth | 2016-11-29 |
| | | | | | | |||
| | | * | | | Merge branch 'security_handshaker1' into security_handshaker2 | Mark D. Roth | 2016-11-29 |
| | | |\ \ \ | |||
| | | | | * | | Revert "Test credentials provider update" | Craig Tiller | 2016-11-29 |
| | | | |/ / | |||
| | | | | * | Renamed google_benchmark submodule to benchmark | David Garcia Quintas | 2016-11-23 |
| | | | | | | |||
| | | | * | | resolve dependency | yang-g | 2016-11-23 |
| | | | |/ | |||
* | | | | | Merge branch 'slice_with_exec_ctx' into eliminate_mdstr | Craig Tiller | 2016-11-18 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-11-18 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||
| | | | * | Rename security handshaker files. | Mark D. Roth | 2016-11-17 |
| | | | | | |||
| | | | * | Use the same connector code for both secure and insecure clients. | Mark D. Roth | 2016-11-17 |
| | | | | | |||
| | * | | | Merge pull request #8617 from markdroth/service_config_json | Mark D. Roth | 2016-11-17 |
| | |\ \ \ | | | | | | | | | | | | | Use JSON tree for service config channel arg. | ||
* | | \ \ \ | Merge branch 'slice_interning' into eliminate_mdstr | Craig Tiller | 2016-11-16 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| * | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-11-16 |
| |\| | | | | |||
| | * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-11-16 |
| | |\| | | | |||
| | | * | | | Merge github.com:grpc/grpc into bm_fullstack | Craig Tiller | 2016-11-16 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||
| | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-16 |
| | | | | |\ | | | | | |/ | | | | |/| | |||
| | | | * | | Merge pull request #8680 from ctiller/no_more_legacy | Craig Tiller | 2016-11-15 |
| | | | |\ \ | | | | | | | | | | | | | | | Remove legacy poller | ||
| | | | * \ \ | Merge remote-tracking branch 'upstream/master' into latency_in_final_info | Mark D. Roth | 2016-11-14 |
| | | | |\ \ \ | |||
| | | | | * \ \ | Merge pull request #8335 from y-zeng/tos | Yuchen Zeng | 2016-11-11 |
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | Add grpc_socket_mutator | ||
* | | | | | | | | | Progress towards mdstr elimination | Craig Tiller | 2016-11-10 |
|/ / / / / / / / | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-10 |
| | | | | | | |\ | | | | | |_|_|/ | | | | |/| | | | |||
* | | | | | | | | Merge branch 'slice_with_exec_ctx' into slice_interning | Craig Tiller | 2016-11-10 |
|\| | | | | | | | |||
| * | | | | | | | Fix foward declaration duplication | Craig Tiller | 2016-11-10 |
| | | | | | | | |