Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into bwest | Craig Tiller | 2017-02-01 |
|\ | |||
| * | Move bidirectional_stream_c.h back to third_party/objective_c/Cronet | Muxi Yan | 2017-01-31 |
* | | Merge github.com:grpc/grpc into bwest | Craig Tiller | 2017-01-31 |
|\| | |||
| * | Add metadata_map.h to build.yaml | yang-g | 2017-01-31 |
| * | Merge pull request #9323 from yang-g/build_fixes | Nicolas Noble | 2017-01-30 |
| |\ | |||
* | | | Fix BUILD | Craig Tiller | 2017-01-27 |
* | | | Reset BUILD file to head | Craig Tiller | 2017-01-27 |
* | | | Merge branch 'bm_countwrites' into bwest | Craig Tiller | 2017-01-27 |
|\| | | |||
* | | | Merge github.com:grpc/grpc into bwest | Craig Tiller | 2017-01-26 |
|\ \ \ | |||
| | * \ | Merge branch 'cp' into rollfwd | Craig Tiller | 2017-01-26 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #9372 from markdroth/proxy_mapper | Mark D. Roth | 2017-01-25 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #9383 from markdroth/http_connect_channel_arg | Mark D. Roth | 2017-01-25 |
| |\ \ \ \ | |||
| | | | * | | Revert "Revert "Metadata handling rewrite"" | Craig Tiller | 2017-01-23 |
| | |_|/ / | |/| | | | |||
| * | | | | Revert "Metadata handling rewrite" | Craig Tiller | 2017-01-20 |
* | | | | | Merge github.com:grpc/grpc into bwest | Craig Tiller | 2017-01-20 |
|\| | | | | |||
| * | | | | Merge github.com:grpc/grpc into metadata_filter | Craig Tiller | 2017-01-18 |
| |\ \ \ \ | |||
| | | * | | | Move detection of HTTP CONNECT proxy from DNS resolver to client channel. | Mark D. Roth | 2017-01-18 |
| | * | | | | Merge pull request #8684 from gcasto/change_cronet_interface | Muxi Yan | 2017-01-18 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||
| * | | | | | Merge github.com:grpc/grpc into metadata_filter | Craig Tiller | 2017-01-17 |
| |\| | | | | |||
| | | | * | | Add proxy mapper hook. | Mark D. Roth | 2017-01-17 |
| | | |/ / | | |/| | | |||
| | * | | | Merge pull request #9303 from nicolasnoble/bazel-fixes | Nicolas Noble | 2017-01-17 |
| | |\ \ \ | |||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-r... | Mark D. Roth | 2017-01-13 |
| | |\ \ \ \ | |||
* | | \ \ \ \ | Merge github.com:grpc/grpc into bwest | Craig Tiller | 2017-01-13 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | | * | | | Fixing a few items with the new Bazel BUILD system: | Nicolas "Pixel" Noble | 2017-01-13 |
| | |_|/ / / | |/| | | | | |||
| | | | | * | Add missing dependency | yang-g | 2017-01-11 |
| | |_|_|/ | |/| | | | |||
| | * | | | Fix build | Craig Tiller | 2017-01-10 |
| | | | * | Merge remote-tracking branch 'upstream/master' into change_cronet_interface | Muxi Yan | 2017-01-10 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | * | | | Merge github.com:grpc/grpc into fix_errors | Craig Tiller | 2017-01-09 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | * | | | Start fixing http error --> grpc status conversion | Craig Tiller | 2017-01-06 |
| * | | | | Handshaker plugin mechanism. | Mark D. Roth | 2017-01-06 |
| | | * | | Merge remote-tracking branch 'upstream/master' into revert-9063-revert-8951-r... | Mark D. Roth | 2017-01-06 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Merge branch 'slice_with_exec_ctx' into metadata_filter | Craig Tiller | 2017-01-04 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2017-01-04 |
| |\ \ \ \ | |||
| | * \ \ \ | Merge pull request #13 from ctiller/patchy | Nicolas Noble | 2017-01-04 |
| | |\ \ \ \ | |||
| | | * | | | | Fixes for tests | Craig Tiller | 2017-01-04 |
| | * | | | | | Putting message size filter back. | Nicolas "Pixel" Noble | 2017-01-04 |
| | |/ / / / | |||
| * | | | | | Merge branch 'patchy' into slice_with_exec_ctx_and_build | Craig Tiller | 2017-01-04 |
| |\| | | | | |||
| | * | | | | Moving message_size_filter properly. | Nicolas "Pixel" Noble | 2017-01-04 |
| | * | | | | Merge remote-tracking branch 'google/master' into bazel-take-2 | Nicolas "Pixel" Noble | 2017-01-04 |
| | |\ \ \ \ | |||
* | | \ \ \ \ | Merge branch 'flow_control_v2' into bwest | Craig Tiller | 2016-12-27 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| | | | | | * | Merge branch 'master' into change_cronet_interface | Muxi Yan | 2016-12-14 |
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | | | |||
| | | | * | | | 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 |
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | | | |||
| | | | | * | | Revert "Revert "Revert "Revert "Remove redundant includes from string.h and t... | Mark D. Roth | 2016-12-12 |
| | |_|_|/ / | |/| | | | | |||
| * | | | | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | Craig Tiller | 2016-12-12 |
| | * | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | * | | 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 |
| | * | | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-06 |
| | |\ \ \ \ \ |