Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | Craig Tiller | 2016-12-12 |
| | |||
* | Merge remote-tracking branch 'upstream/master' into ↵ | Mark D. Roth | 2016-12-09 |
|\ | | | | | | | revert-8949-revert-8922-slice_cleanup | ||
| * | Renamed google_benchmark submodule to benchmark | David Garcia Quintas | 2016-12-06 |
| | | |||
* | | Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" | Mark D. Roth | 2016-12-05 |
|/ | |||
* | Merge pull request #8949 from grpc/revert-8922-slice_cleanup | Mark D. Roth | 2016-12-05 |
|\ | | | | | Revert "Remove redundant includes from string.h and tmpfile.h" | ||
* | | Revert "Renamed google_benchmark submodule to benchmark" | Mark D. Roth | 2016-12-05 |
| | | |||
| * | Revert "Remove redundant includes from string.h and tmpfile.h" | Mark D. Roth | 2016-12-05 |
|/ | |||
* | Merge pull request #8922 from sreecha/slice_cleanup | Mark D. Roth | 2016-12-05 |
|\ | | | | | Remove redundant includes from string.h and tmpfile.h | ||
* \ | Merge pull request #8851 from dgquintas/rename_gbench | Mark D. Roth | 2016-12-05 |
|\ \ | | | | | | | Renamed google_benchmark submodule to benchmark | ||
* | | | Use the same server code for both secure and insecure servers. | Mark D. Roth | 2016-12-02 |
| | | | |||
| | * | Temporarily enable gpr_slice_* functions to not break api compatibility | Sree Kuchibhotla | 2016-12-01 |
| | | | |||
* | | | Merge remote-tracking branch 'upstream/master' into security_handshaker2 | Mark D. Roth | 2016-11-30 |
|\ \ \ | | |/ | |/| | |||
* | | | Fixed build.yaml and ran generate_projects.sh. | Mark D. Roth | 2016-11-29 |
| | | | |||
* | | | Merge branch 'security_handshaker1' into security_handshaker2 | Mark D. Roth | 2016-11-29 |
|\ \ \ | |||
| | * | | Revert "Test credentials provider update" | Craig Tiller | 2016-11-29 |
| |/ / | |||
| * | | Merge pull request #8838 from yang-g/test_credentials | Yang Gao | 2016-11-29 |
| |\ \ | | | | | | | | | Test credentials provider update | ||
| * | | | Update build.yaml to fix MacOS build | ncteisen | 2016-11-28 |
| | | | | |||
| | | * | Renamed google_benchmark submodule to benchmark | David Garcia Quintas | 2016-11-23 |
| | |/ | |/| | |||
| | * | resolve dependency | yang-g | 2016-11-23 |
| |/ | |||
* | | Rename security handshaker files. | Mark D. Roth | 2016-11-17 |
| | | |||
* | | Use the same connector code for both secure and insecure clients. | Mark D. Roth | 2016-11-17 |
| | | |||
| * | Merge pull request #8617 from markdroth/service_config_json | Mark D. Roth | 2016-11-17 |
| |\ | | | | | | | Use JSON tree for service config channel arg. | ||
| * \ | Merge github.com:grpc/grpc into bm_fullstack | Craig Tiller | 2016-11-16 |
| |\ \ | |/ / |/| | | |||
| | * | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-16 |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #8680 from ctiller/no_more_legacy | Craig Tiller | 2016-11-15 |
|\ \ \ | | | | | | | | | Remove legacy poller | ||
* \ \ \ | Merge pull request #8335 from y-zeng/tos | Yuchen Zeng | 2016-11-11 |
|\ \ \ \ | | | | | | | | | | | Add grpc_socket_mutator | ||
| | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-10 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into ssl_fuzzer | yang-g | 2016-11-08 |
|\ \ \ \ \ | |||
| | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-08 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | Merge pull request #8618 from markdroth/channel_info_api | Mark D. Roth | 2016-11-08 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Add API for getting arbitrary state back from a channel | ||
| * \ \ \ \ \ | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\ \ \ \ \ \ | |||
| | | | | | * \ | Merge github.com:grpc/grpc into bm_fullstack | Craig Tiller | 2016-11-08 |
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | |||
| | * | | | | | | Merge github.com:grpc/grpc into fuzzit | Craig Tiller | 2016-11-08 |
| | |\ \ \ \ \ \ | |||
| | | | | | * | | | Remove legacy poller | Craig Tiller | 2016-11-08 |
| | | | |_|/ / / | | | |/| | | | | |||
| * | | | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| * | | | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-08 |
| |\ \ \ \ \ \ \ | |||
| | | | | * | | | | Fix C++ filter API and add test for it. | Mark D. Roth | 2016-11-07 |
| | | |_|/ / / / | | |/| | | | | | |||
* | | | | | | | | Merge remote-tracking branch 'upstream/master' into ssl_fuzzer | yang-g | 2016-11-07 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-07 |
| | | | | | | |\ | | |_|_|_|_|_|/ | |/| | | | | | | |||
| | | * | | | | | Get user agent right | Craig Tiller | 2016-11-04 |
| | | | | | | | | |||
| | | * | | | | | Merge github.com:grpc/grpc into decouple_version_number | Craig Tiller | 2016-11-04 |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
* | | | | | | | | Add a fuzzer for ssl server side | yang-g | 2016-11-04 |
| | | | | | | | | |||
| * | | | | | | | Merge pull request #8456 from ctiller/pid_ctl | Craig Tiller | 2016-11-04 |
|/| | | | | | | | | | | | | | | | | | | | | | | | Simple PID controller | ||
| | | | * | | | | Merge github.com:grpc/grpc into fuzzit | Craig Tiller | 2016-11-04 |
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into service_config_json | Mark D. Roth | 2016-11-04 |
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | | | |||
| | | | | | * | | Merge github.com:grpc/grpc into bm_fullstack | Craig Tiller | 2016-11-04 |
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
| | * | | | | | | Merge github.com:grpc/grpc into grpc_slice | Craig Tiller | 2016-11-04 |
| | |\ \ \ \ \ \ | |||
* | | \ \ \ \ \ \ | Merge github.com:grpc/grpc into microbench | Craig Tiller | 2016-11-04 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #8620 from nicolasnoble/master | David G. Quintas | 2016-11-04 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Removing dependency between tsi and grpc. | ||
| | | | | | | | | * | Rename method_config.[ch] to service_config.[ch]. | Mark D. Roth | 2016-11-03 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | |