Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #9694 from nicolasnoble/upmerge_from_1_1_x | 2017-02-23 | |
|\ | | | | | Upmerge from 1.1.x | ||
* | | Use call context to propagare LR costs | 2017-02-13 | |
| | | |||
| * | Merge remote-tracking branch 'google/v1.1.x' | 2017-02-13 | |
|/| | |||
| * | build fixes for ruby on mac | 2017-02-09 | |
| | | |||
* | | Merge pull request #9371 from Vizerai/tracing_API | 2017-02-08 | |
|\ \ | | | | | | | Tracing API | ||
* | | | Secure naming support for gRPCLB | 2017-02-07 | |
| | | | |||
| | * | also pick up latest version of google-protobuf | 2017-02-02 | |
| | | | |||
* | | | Merge branch 'bm_countwrites' into bwest | 2017-01-27 | |
|\ \ \ | |||
| | * \ | Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_API | 2017-01-27 | |
| | |\ \ | | |/ / | |/| | | |||
* | | | | Merge github.com:grpc/grpc into bwest | 2017-01-26 | |
|\ \ \ \ | |||
| | | * \ | Merge branch 'master' of https://github.com/Vizerai/grpc into tracing_API | 2017-01-26 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Merge branch 'cp' into rollfwd | 2017-01-26 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #9372 from markdroth/proxy_mapper | 2017-01-25 | |
| |\ \ \ \ | | | | | | | | | | | | | Add proxy mapper hook. | ||
| * \ \ \ \ | Merge pull request #9383 from markdroth/http_connect_channel_arg | 2017-01-25 | |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Trigger HTTP CONNECT handshaker via channel args. | ||
| | | | * | | Revert "Revert "Metadata handling rewrite"" | 2017-01-23 | |
| | |_|/ / | |/| | | | | | | | | | | | | | This reverts commit 5e01e2ac977655aa074faf7fde0a74298f5e4c55. | ||
| * | | | | Revert "Metadata handling rewrite" | 2017-01-20 | |
| | | | | | |||
| * | | | | Merge pull request #9340 from stanley-cheung/update-boringssl | 2017-01-20 | |
| |\ \ \ \ | | | | | | | | | | | | | Update boringssl | ||
| | | | | * | update | 2017-01-20 | |
| | | | | | | |||
* | | | | | | Merge github.com:grpc/grpc into bwest | 2017-01-20 | |
|\| | | | | | |||
| | * | | | | Update boringssl to latest chromium-stable | 2017-01-20 | |
| | | |_|/ | | |/| | | |||
| | | * | | Move detection of HTTP CONNECT proxy from DNS resolver to client channel. | 2017-01-18 | |
| | |/ / | |||
| * | | | Merge github.com:grpc/grpc into metadata_filter | 2017-01-17 | |
| |\| | | |||
| | | * | Add proxy mapper hook. | 2017-01-17 | |
| | |/ | |||
| | * | Merge remote-tracking branch 'upstream/master' into ↵ | 2017-01-13 | |
| | |\ | | | | | | | | | | | | | revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup | ||
* | | \ | Merge github.com:grpc/grpc into bwest | 2017-01-13 | |
|\ \ \ \ | | |_|/ | |/| | | |||
| | * | | Fix build | 2017-01-10 | |
| | | | | |||
| | * | | Merge github.com:grpc/grpc into fix_errors | 2017-01-09 | |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Start fixing http error --> grpc status conversion | 2017-01-06 | |
| | | | | |||
| * | | | Handshaker plugin mechanism. | 2017-01-06 | |
| | | | | |||
| | | * | Merge remote-tracking branch 'upstream/master' into ↵ | 2017-01-06 | |
| | | |\ | | |_|/ | |/| | | | | | | revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup | ||
| * | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2017-01-04 | |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'patchy' into slice_with_exec_ctx_and_build | 2017-01-04 | |
| |\ \ \ \ | |||
| | * | | | | Moving message_size_filter properly. | 2017-01-04 | |
| | |/ / / | |||
* | | | | | Merge branch 'flow_control_v2' into bwest | 2016-12-27 | |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | | * | | Merge branch 'slice_with_exec_ctx' into metadata_filter | 2016-12-27 | |
| | | |\ \ | | | |/ / | | |/| | | |||
| | * | | | 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 | ||
| | | | * \ | Merge branch 'slice_with_exec_ctx' into metadata_filter | 2016-12-12 | |
| | | | |\ \ | | | | |/ / | | | |/| | | |||
| | | * | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | 2016-12-12 | |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| | | | | * | Revert "Revert "Revert "Revert "Remove redundant includes from string.h and ↵ | 2016-12-12 | |
| | |_|_|/ | |/| | | | | | | | | | | | | | tmpfile.h"""" | ||
| * | | | | 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 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 | |
| | | | | | | |||
| | | * | | | 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 | |
| | |_|/ / / | |/| | | | | |||
| * | | | | | 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 | ||
| * | | | | | | Use the same server code for both secure and insecure servers. | 2016-12-02 | |
| | | | | | | |