Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-27 | |
|\ | |||
| * | v1.0.x → master upmerge | 2016-12-16 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual changes: - Fixed use of Exception.message in _invalid_metadata_test.py - Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb - Added "set -e" to generate_build_additions.sh | ||
| * | | Move internal channel arg definitions out of public headers. | 2016-12-12 | |
| | | | |||
| * | | Merge remote-tracking branch 'upstream/master' into client_channel_init_cleanup | 2016-12-12 | |
| |\ \ | |||
| * | | | Eliminate redundant places where server name was stored. | 2016-12-12 | |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-12 | |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | 2016-12-12 | |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-12 | |
|\| | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into client_channel_init_cleanup | 2016-12-09 | |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into client_channel_init_cleanup | 2016-12-09 | |
| | |\ \ | |||
| * | \ \ | Merge remote-tracking branch 'upstream/master' into ↵ | 2016-12-09 | |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | revert-8949-revert-8922-slice_cleanup | ||
* | | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-06 | |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | * | | | clang-format | 2016-12-06 | |
| | | | | | |||
| * | | | | gpr_atm isn't automatically initialized to 0. Thanks Obama. | 2016-12-05 | |
| | | | | | |||
| * | | | | clang-format | 2016-12-05 | |
| | | | | | |||
| * | | | | Track requests that could cause other requests to be created, and don't do | 2016-12-05 | |
| | | | | | | | | | | | | | | | | | | | | a real core shutdown of a CQ until such requests are done | ||
| | * | | | Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" | 2016-12-05 | |
| |/ / / | |||
| * | | | Revert "Remove redundant includes from string.h and tmpfile.h" | 2016-12-05 | |
| | | | | |||
| * | | | Temporarily enable gpr_slice_* functions to not break api compatibility | 2016-12-01 | |
| | | | | |||
| | | * | Clarify grpc_call_start_batch error semantics | 2016-11-30 | |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-30 | |
|\| | | | |||
| | * | | Merge remote-tracking branch 'upstream/master' into client_channel_init_cleanup | 2016-11-28 | |
| | |\ \ | | |/ / | |/| | | |||
| * | | | add todo | 2016-11-18 | |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-18 | |
|\ \ \ \ | |||
| | | * | | Avoid confusion between server name and URI. | 2016-11-18 | |
| | | | | | |||
| | | * | | Pass client channel factory and server name via channel args. | 2016-11-18 | |
| | | | | | |||
| | * | | | Expose message limit constants so that users can reference them | 2016-11-17 | |
| |/ / / | |||
| * | | | Merge pull request #8617 from markdroth/service_config_json | 2016-11-17 | |
| |\ \ \ | | | | | | | | | | | Use JSON tree for service config channel arg. | ||
* | | | | | Fix include guards | 2016-11-16 | |
| | | | | | |||
* | | | | | Merge branch 'slice_with_exec_ctx' of github.com:ctiller/grpc into ↵ | 2016-11-16 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | slice_with_exec_ctx | ||
* \ \ \ \ \ | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-16 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #8630 from ctiller/newlines | 2016-11-16 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Support percent-encoding status messages | ||
| * | | | | | | Review feedback | 2016-11-16 | |
| | | | | | | | |||
| * | | | | | | Merge github.com:grpc/grpc into bm_fullstack | 2016-11-16 | |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into newlines | 2016-11-16 | |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | | | | * | | Merge remote-tracking branch 'upstream/master' into service_config_json | 2016-11-16 | |
| | | | | |\ \ | | | |_|_|/ / | | |/| | | | | |||
| | * | | | | | Merge branch 'master' of github.com:grpc/grpc into rr_fixall | 2016-11-14 | |
| | |\ \ \ \ \ | |||
| | | | | * | | | Review feedback | 2016-11-14 | |
| |_|_|_|/ / / |/| | | | | | | |||
| | | * | | | | Merge pull request #8086 from y-zeng/fix_gprc | 2016-11-11 | |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Fix misspelled gprc | ||
| | | * \ \ \ \ | Merge pull request #8335 from y-zeng/tos | 2016-11-11 | |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add grpc_socket_mutator | ||
* | | | | | | | | | Fix foward declaration duplication | 2016-11-10 | |
| | | | | | | | | | |||
| | | | | | | * | | Allow setting service config via C++ API, for use in tests. | 2016-11-09 | |
| | | | | | | | | | |||
| | | | | | | * | | Allow getting LB policy name and service config in C++ API. | 2016-11-09 | |
| | | | | | | | | | |||
| | | | | | | * | | Allow fetching service config via grpc_channel_get_info(). | 2016-11-09 | |
| | | | |_|_|/ / | | | |/| | | | | |||
* | | | | | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-11-09 | |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #8679 from markdroth/core_api_cleanup | 2016-11-08 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove deprecated macros from C-core API. | ||
| | * | | | | | | | Re-add GRPC_ARG_MAX_MESSAGE_LENGTH, which can't be removed yet. | 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 | ||
| | | | | * | | | | | Added INIT state to grpc_connectivity_state | 2016-11-08 | |
| | | | | | | | | | | |||
| | | | * | | | | | | Merge github.com:grpc/grpc into bm_fullstack | 2016-11-08 | |
| | | | |\ \ \ \ \ \ |