Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | David Garcia Quintas | 2017-04-28 |
|\ | |||
* \ | Merge pull request #10824 from ctiller/proxy2 | Craig Tiller | 2017-04-28 |
|\ \ | |||
* \ \ | Merge pull request #10613 from ctiller/framing_costs | Craig Tiller | 2017-04-27 |
|\ \ \ | |||
* \ \ \ | Merge pull request #10522 from jiangtaoli2016/new_tsi | David G. Quintas | 2017-04-27 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #10427 from ctiller/c++lame | Craig Tiller | 2017-04-27 |
|\ \ \ \ \ | |||
* | | | | | | fix security_connector.c formatting | Jan Tattermusch | 2017-04-27 |
* | | | | | | Removing cipher suites blacklisted in HTTP2. | Julien Boeuf | 2017-04-26 |
* | | | | | | Merge pull request #10627 from jboeuf/more_ssl_factory_cleanup | jboeuf | 2017-04-26 |
|\ \ \ \ \ \ | |||
| | * \ \ \ \ | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-26 |
| | |\ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #10823 from ncteisen/client-auth-filter-fuzz | Noah Eisen | 2017-04-26 |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #10805 from dgquintas/g_for_1.4.x | David G. Quintas | 2017-04-26 |
|\ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ | Merge pull request #10629 from kuscsik/build_fix | Vijay Pai | 2017-04-26 |
|\ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | more TLS cleanup. | Julien Boeuf | 2017-04-26 |
| |_|_|/ / / / / / |/| | | | | | | | | |||
| * | | | | | | | | core, avl: rename static functions | Zoltan Kuscsik | 2017-04-26 |
| | | * | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into client-auth-filter... | Noah Eisen | 2017-04-25 |
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||
| | | | | * | | | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-25 |
| | | | | |\ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | |||
| | | * | | | | | | clang fmt | Noah Eisen | 2017-04-25 |
| | | * | | | | | | Propagate publish error | Noah Eisen | 2017-04-24 |
* | | | | | | | | | Merge pull request #10796 from danzh2010/udpserver2 | Yang Gao | 2017-04-24 |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | | * \ \ \ | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-24 |
| | | | | | |\ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||
| | | | | | * | | | | fix guards in transport_security_adapter.h | jiangtaoli2016 | 2017-04-24 |
| | | | | * | | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-24 |
| | | | | |\ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #10584 from ctiller/hybrid | Craig Tiller | 2017-04-24 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * | | Fix potential memory leak, cleanup some code | Craig Tiller | 2017-04-24 |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||
| | | | | * | | | | | Don't abort on input | Noah Eisen | 2017-04-24 |
| |_|_|_|/ / / / / |/| | | | | | | | | |||
| | | | | | * | | | fix guard on src/core/tsi/transport_security_adapter.h | jiangtaoli2016 | 2017-04-24 |
| | | | | | * | | | Merge branch 'master' into new_tsi | jiangtaoli2016 | 2017-04-24 |
| | | | | | |\ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #10258 from markdroth/service_config_lb_semantics | Mark D. Roth | 2017-04-24 |
|\ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-24 |
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #10801 from dgquintas/demote_handshake | David G. Quintas | 2017-04-21 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | | updated g meaning for 1.4.x | David Garcia Quintas | 2017-04-21 |
| | | | | | | | | * | | Copy slices for in-process transports: its no longer safe to just ref | Craig Tiller | 2017-04-21 |
* | | | | | | | | | | | Merge github.com:grpc/grpc into count_now | Craig Tiller | 2017-04-21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #10777 from ctiller/c++compat1 | Craig Tiller | 2017-04-21 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #10779 from ctiller/c++compat2 | Craig Tiller | 2017-04-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | |||
| | | | * | | | | | | | | | Demote handshake logging msg to DEBUG | David Garcia Quintas | 2017-04-21 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||
| | | | | | * | | | | | | Add make udp_server shutdown_fd() protected by mutex lock. | Dan Zhang | 2017-04-21 |
| * | | | | | | | | | | | Merge pull request #10639 from vjpai/buildfixes | Vijay Pai | 2017-04-21 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #10742 from markdroth/hash_table | Mark D. Roth | 2017-04-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||
| | | | | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into service_config_lb_semantics | Mark D. Roth | 2017-04-21 |
| | | | | | |\ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||
| | | | | | | | | * | | | | Merge github.com:grpc/grpc into c++lame | Craig Tiller | 2017-04-21 |
| | | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |||
| | | | | | | | | | | * | | Merge github.com:grpc/grpc into framing_costs | Craig Tiller | 2017-04-21 |
| | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||
| | | | | * | | | | | | | | Merge github.com:grpc/grpc into c++compat1 | Craig Tiller | 2017-04-21 |
| | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||
| | | | * | | | | | | | | | Merge github.com:grpc/grpc into c++compat2 | Craig Tiller | 2017-04-21 |
| | | | |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge pull request #10771 from ncteisen/yet-another-error-refcount-bug | Noah Eisen | 2017-04-21 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * \ \ \ \ \ | Merge github.com:grpc/grpc into hybrid | Craig Tiller | 2017-04-21 |
| | | | | | | | |\ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Merge pull request #10739 from muxi/fix-unpaired-benchmark | Muxi Yan | 2017-04-20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into yet-another-error-... | Noah Eisen | 2017-04-20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
| | | | | | * | | | | | | | | | C++ compatibility fix for stack_lockfree.c | Craig Tiller | 2017-04-20 |
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | |||
| | | | | | * | | | | | | | | C++ compatibility fix for tmpfile_posix.c | Craig Tiller | 2017-04-20 |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |