aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Collapse)AuthorAge
...
| * | | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmergeGravatar Nicolas "Pixel" Noble2016-09-08
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Fix merge errorGravatar Craig Tiller2016-09-07
| | | | | | | | |
| | | | | | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-07
| | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-09-07
| | | | | | | |\ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-09-07
|\| | | | | | | |
| * | | | | | | | Merge pull request #7774 from ctiller/percent-encoderGravatar Craig Tiller2016-09-06
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Percent encoding routines
| * \ \ \ \ \ \ \ \ Merge pull request #7953 from makdharma/grpc_caching_testGravatar Nicolas Noble2016-09-06
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | Grpc caching test
| | | | | | | | * | Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-09-06
| | | | | | | | |\ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| | | | | | * | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filterGravatar Mark D. Roth2016-09-06
| | | | | | |\ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-09-02
|\| | | | | | | | |
| | | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanseGravatar David Garcia Quintas2016-09-02
| | | | | |\ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | | | | | | | | * Merge remote-tracking branch 'upstream/master' into deadline_filterGravatar Mark D. Roth2016-09-01
| | | | | | | | | |\ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge pull request #7943 from markdroth/client_channel_cleanupGravatar Mark D. Roth2016-09-01
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Move subchannel_call_holder code into client_channel module.
| | | | | | * \ \ \ \ Merge branch 'master' of github.com:grpc/grpc into codegen_cleanseGravatar David Garcia Quintas2016-09-01
| | | | | | |\ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #7936 from y-zeng/log_testGravatar Craig Tiller2016-09-01
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add no-logging test
| | | | | | | | | | | * Merge branch 'client_channel_cleanup' into deadline_filterGravatar Mark D. Roth2016-09-01
| | | | | | | | | | | |\ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | Move subchannel_call_holder code into client_channel module.Gravatar Mark D. Roth2016-08-31
| | | | | | | | | | | |
| * | | | | | | | | | | add trace context protoGravatar Alistair Veitch2016-08-31
| | |/ / / / / / / / / | |/| | | | | | | | |
| | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into http_connectGravatar Mark D. Roth2016-08-31
| | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-08-30
|\| | | | | | | | | |
| | * | | | | | | | | Add no-logging testGravatar Yuchen Zeng2016-08-30
| |/ / / / / / / / /
| | | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanseGravatar David Garcia Quintas2016-08-30
| | | | | |\ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #7839 from markdroth/rename_client_configGravatar Mark D. Roth2016-08-29
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Rename grpc_client_config to grpc_resolver_result.
| | | * | | | | | | | end-to-end test for cacheable requests.Gravatar Makarand Dharmapurikar2016-08-29
| | | | | | | | | | |
| | | | | * | | | | | Revert change to grpc++_base uses sectionGravatar murgatroid992016-08-29
| | | | | | | | | | |
| | | | | * | | | | | build.yaml changes to make certain builds workGravatar murgatroid992016-08-26
| | | | | | | | | | |
| | | | | | | | * | | Add list commandGravatar Yuchen Zeng2016-08-26
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
| | | | | | | * | | Re-run generate_projects.sh.Gravatar Mark D. Roth2016-08-26
| | | | | | | | | |
| | | | | | | | | * Initial code to move deadline timer into a filter. Timer cancellationGravatar Mark D. Roth2016-08-26
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | not working right -- will fix in subsequent commit.
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into max_send_size_filterGravatar Mark D. Roth2016-08-25
| | | | | | | |\ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| | | | | | | * | Add channel arg for max send message size and add message size filter.Gravatar Mark D. Roth2016-08-23
| | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Rename grpc_client_config to grpc_resolver_result.Gravatar Mark D. Roth2016-08-22
| | | | | | | |
| | | | | * | | Rename some files to avoid conflicting .obj files on WindowsGravatar Craig Tiller2016-08-22
| | | | | | | |
| * | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpcGravatar Nicolas "Pixel" Noble2016-08-20
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Bumping version to 1.0.1-pre1.Gravatar Nicolas "Pixel" Noble2016-08-18
| | | | | | |
| | * | | | | Merge pull request #7745 from nicolasnoble/no-more-preGravatar Nicolas Noble2016-08-18
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | Removing pre2 flag.
| | | | | * | | Add a strict and a permissive decoder, allow different reserved alphabetsGravatar Craig Tiller2016-08-18
| | | | | | | |
| | * | | | | | Merge pull request #7752 from nicolasnoble/unsecure-should-be-unsecureGravatar Nicolas Noble2016-08-18
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure.
| * | \ \ \ \ \ \ Merge pull request #7741 from nicolasnoble/manual-upmergeGravatar Nicolas Noble2016-08-18
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Manual upmerge from v1.0.x to master.
| | | | | | | * | | Percent encoding routinesGravatar Craig Tiller2016-08-18
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge pull request #7735 from y-zeng/cli_main_forkGravatar kpayson642016-08-17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Improve gRPC CLI
| * \ \ \ \ \ \ \ \ Merge pull request #7594 from chedeti/grpc-thrift-v2Gravatar kpayson642016-08-17
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | grpc thrift integration
| | | | | | * | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure.Gravatar Nicolas "Pixel" Noble2016-08-17
| | | | | | | | | |
| | | | | | | * | | Removing pre2 flag.Gravatar Nicolas "Pixel" Noble2016-08-16
| | | | | | |/ / /
| | | | | * / / / Update required protobuf version to v3.0.0Gravatar Yuchen Zeng2016-08-15
| | | | | |/ / /
| | | | * / / / Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmergeGravatar Nicolas "Pixel" Noble2016-08-16
| | |_|/| | | | | |/| | |/ / /
| | | * | | | Add CliCredentials, config_grpc_cli.hGravatar Yuchen Zeng2016-08-15
| | | | | | |
| | | * | | | Merge remote-tracking branch 'upstream/master' into cli_main_forkGravatar Yuchen Zeng2016-08-15
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | | | | | * Merge branch 'handshaker_api' into http_connectGravatar Mark D. Roth2016-08-11
| | | | | | |\ | | |_|_|_|_|/ | |/| | | | |
| | | | * | | Remove use of verify-install target in MakefileGravatar murgatroid992016-08-10
| | | | | | |