Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | 2016-09-02 | |
|\ | |||
| * | Merge pull request #7943 from markdroth/client_channel_cleanup | 2016-09-01 | |
| |\ | | | | | | | Move subchannel_call_holder code into client_channel module. | ||
| * \ | Merge pull request #7936 from y-zeng/log_test | 2016-09-01 | |
| |\ \ | | | | | | | | | Add no-logging test | ||
| * \ \ | Merge pull request #7942 from a-veitch/add_proto | 2016-09-01 | |
| |\ \ \ | | | | | | | | | | | Add Trace context proto. This is used to transmit trace context between RPC client and server systems. | ||
| * \ \ \ | Merge pull request #7877 from adelez/route_to_gfe | 2016-09-01 | |
| |\ \ \ \ | | | | | | | | | | | | | Use the VIP that routes to GFE. | ||
* | | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | 2016-09-01 | |
|\| | | | | | |||
| * | | | | | Merge pull request #7862 from makdharma/grpc_caching | 2016-09-01 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | prep work for enabling caching | ||
| | | | | * \ | Merge remote-tracking branch 'upstream/master' into log_test | 2016-08-31 | |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
| | | | | | * | Move subchannel_call_holder code into client_channel module. | 2016-08-31 | |
| | |_|_|_|/ | |/| | | | | |||
| | | | * | | add trace context proto | 2016-08-31 | |
| | |_|/ / | |/| | | | |||
| | | | * | Add no-logging test | 2016-08-30 | |
| | | | | | |||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | 2016-08-30 | |
|\| | | | | |||
| | | * | | Fix full cloud to prod | 2016-08-30 | |
| | | | | | |||
| * | | | | Updated protobuf to bba446bbf2ac7b0b9923d4eb07d5acd0665a8cf0 | 2016-08-30 | |
| | |_|/ | |/| | | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | 2016-08-29 | |
|\| | | | |||
| * | | | Merge pull request #7839 from markdroth/rename_client_config | 2016-08-29 | |
| |\ \ \ | | | | | | | | | | | Rename grpc_client_config to grpc_resolver_result. | ||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into lb_add_md | 2016-08-29 | |
|\| | | | | |||
| | | | * | Use the VIP that routes to GFE. | 2016-08-25 | |
| | |_|/ | |/| | | |||
| | | * | prep work for enabling caching | 2016-08-24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new header grpc-payload-bin Added new channel arg for setting max payload size Ability to create a GET request in client filter Ability to parse the payload from header in server filter. | ||
| * | | | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | 2016-08-23 | |
| |\ \ \ | | | | | | | | | | | Upmerge from v1.0.x | ||
| * \ \ \ | Merge pull request #7819 from stanley-cheung/php-update-composer | 2016-08-23 | |
| |\ \ \ \ | | | | | | | | | | | | | PHP: bump version (master) | ||
| * \ \ \ \ | Merge pull request #7763 from thunderboltsid/add-pypy-to-dockerfile | 2016-08-22 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add PyPy 5.3.1 to dockerfile and template | ||
* | | | | | | | Update protobuf version to 3.0.0 | 2016-08-22 | |
| | | | | | | | |||
| | | | | * | | Rename grpc_client_config to grpc_resolver_result. | 2016-08-22 | |
| | | | | | | | |||
| | | * | | | | php: bump version | 2016-08-22 | |
| | |/ / / / | |/| | | | | |||
* / | | | | | Updated LB proto and nanopb version | 2016-08-20 | |
|/ / / / / | |||
* | | | | | Merge pull request #7718 from adelez/build_stats | 2016-08-19 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Tool for collecting build statistics. | ||
| | | * | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | 2016-08-20 | |
| |_|/| | |/| | | | | |||
* | | | | | Merge pull request #7308 from ctiller/moovee | 2016-08-18 | |
|\ \ \ \ \ | | | | | | | | | | | | | Prep for making GA video | ||
| | | | * | | Bumping version to 1.0.1-pre1. | 2016-08-18 | |
| | | | | | | |||
| | | | * | | Merge pull request #7745 from nicolasnoble/no-more-pre | 2016-08-18 | |
| | | | |\ \ | | | | | | | | | | | | | | | Removing pre2 flag. | ||
| | | | * \ \ | Merge pull request #7776 from kpayson64/templatize_dependencies | 2016-08-18 | |
| | | | |\ \ \ | | | | | | | | | | | | | | | | | Use templates for python version dependencies | ||
| | | | | * | | | Use templates for python version dependencies | 2016-08-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change grpcio-tools to be a runtime dependency of grpcio-tests, grpcio-tools is run as part of the tests. | ||
| | | | * | | | | Merge pull request #7752 from nicolasnoble/unsecure-should-be-unsecure | 2016-08-18 | |
| | | | |\ \ \ \ | | | | | |/ / / | | | | |/| | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | ||
* | | | | | | | | Merge pull request #7741 from nicolasnoble/manual-upmerge | 2016-08-18 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Manual upmerge from v1.0.x to master. | ||
* \ \ \ \ \ \ \ \ | Merge pull request #7735 from y-zeng/cli_main_fork | 2016-08-17 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Improve gRPC CLI | ||
* \ \ \ \ \ \ \ \ \ | Merge pull request #7594 from chedeti/grpc-thrift-v2 | 2016-08-17 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | grpc thrift integration | ||
| | | | | | | * | | | | Add Python3.5 grpcio-tools binaries | 2016-08-17 | |
| | | | | | | | | | | | |||
| | | | | | * | | | | | Add PyPy 5.3.1 to dockerfile and template | 2016-08-17 | |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #7679 from stanley-cheung/fix-jenkins-linux-image | 2016-08-17 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix jenkins linux image in create script | ||
| | | | | | | | * | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | 2016-08-17 | |
| | | | | | | |/ / / | |||
* | | | | | | | | / | fix_interop_server_arg | 2016-08-16 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||
| | | | | | | * | | Merge pull request #7448 from jcanizales/p0-archive-fix | 2016-08-16 | |
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Work around Cocoapods dynamic frameworks incompatibility with XCode archive | ||
* | | | | | | | \ \ | Merge pull request #7633 from thunderboltsid/add-pypy-to-testing-toolchain | 2016-08-15 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | add PyPy to testing toolchain | ||
| | | | | | | | | | * | Removing pre2 flag. | 2016-08-16 | |
| | | | | | | | | |/ | | | | | | | | |/| | |||
| | | | | * | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | 2016-08-16 | |
| |_|_|_|/| | | | | |/| | | | | | | | | | |||
| | | | | | | | * | | Merge pull request #7732 from kpayson64/python3_artifacts | 2016-08-15 | |
| | | | | | |_|/| | | | | | | |/| | | | | | | | | | | | | | | Add Python3.5 artifact targets | ||
| | | | * | | | | | | Add CliCredentials, config_grpc_cli.h | 2016-08-15 | |
| | | | | | | | | | | |||
| | | | | | | | * | | Add Python3.5 artifact targets | 2016-08-15 | |
| | | | | | | | | | | |||
| | | | * | | | | | | Merge remote-tracking branch 'upstream/master' into cli_main_fork | 2016-08-15 | |
| | | | |\ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | | |