Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #5408 from jboeuf/server_security_connector | Yang Gao | 2016-02-25 |
|\ | |||
* \ | Merge pull request #5293 from dgquintas/alarm_cpp | Vijay Pai | 2016-02-25 |
|\ \ | |||
* \ \ | Merge pull request #5307 from ctiller/hide-the-worker | Vijay Pai | 2016-02-25 |
|\ \ \ | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into server_security_connector | Julien Boeuf | 2016-02-25 |
| | | |\ | |_|_|/ |/| | | | |||
* | | | | Merge pull request #5327 from yang-g/v1alpha_to_v1 | Yang Gao | 2016-02-25 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #5086 from chrisdunelm/coreclr_platforms | Jan Tattermusch | 2016-02-25 |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge pull request #5359 from nicolasnoble/upmerge | Jan Tattermusch | 2016-02-25 |
|\ \ \ \ \ \ | |||
* | | | | | | | clang-format all the things. | Nicolas "Pixel" Noble | 2016-02-25 |
* | | | | | | | Fixing format and copyright. | Nicolas "Pixel" Noble | 2016-02-25 |
| | | | | | * | Have a dedicated server security connector. | Julien Boeuf | 2016-02-24 |
* | | | | | | | Merge pull request #5315 from makdharma/master | Jorge Canizales | 2016-02-24 |
|\ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ | Merge pull request #5384 from ctiller/44 | Vijay Pai | 2016-02-24 |
|\ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ | Merge pull request #5087 from chrisdunelm/coreclr_DefaultSslRootsOverride2 | Jan Tattermusch | 2016-02-24 |
|\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | Fix bug | Craig Tiller | 2016-02-24 |
| | * | | | | | | | | Merge github.com:grpc/grpc into 44 | Craig Tiller | 2016-02-24 |
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | |||
| | | | | | * | | | | Merge remote-tracking branch 'upstream/master' into v1alpha_to_v1 | yang-g | 2016-02-24 |
| | | | | | |\ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||
| | | * | | | | | | | Order change of includes. | Makarand Dharmapurikar | 2016-02-24 |
| | | * | | | | | | | Reverted a change, removed empty test. | Makarand Dharmapurikar | 2016-02-24 |
| | | * | | | | | | | Fixed nits. | Makarand Dharmapurikar | 2016-02-24 |
* | | | | | | | | | | Merge pull request #5390 from ctiller/tls_init | Vijay Pai | 2016-02-24 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||
| | | * | | | | | | | Merge github.com:grpc/grpc into 44 | Craig Tiller | 2016-02-24 |
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #5365 from ctiller/naming-crisis | Nicolas Noble | 2016-02-24 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | Properly initialize TLS var | Craig Tiller | 2016-02-24 |
| |/ / / / / / / / / |/| | | | | | | | | | |||
| | | | | | | | * | | Port pollset worker changes to windows | Craig Tiller | 2016-02-24 |
| | | | | | | | * | | Merge github.com:grpc/grpc into hide-the-worker | Craig Tiller | 2016-02-24 |
| | | | | | | | |\ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||
* | | | | | | | | | | updated generated lb proto code to latest nanopb version | David Garcia Quintas | 2016-02-23 |
| * | | | | | | | | | Merge github.com:grpc/grpc into naming-crisis | Craig Tiller | 2016-02-23 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||
| | | * | | | | | | | Add fallback for secure_getenv (again) | Craig Tiller | 2016-02-23 |
| | | | * | | | | | | Addressed feedback from @jcanizales | Makarand Dharmapurikar | 2016-02-23 |
* | | | | | | | | | | Merge pull request #5375 from jtattermusch/grpcpreconditions_fix | Vijay Pai | 2016-02-23 |
|\ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #5213 from ctiller/fix-proto-docker | David G. Quintas | 2016-02-23 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | fix C# build | Jan Tattermusch | 2016-02-23 |
| |/ / / / / / / / / / |/| | | | | | | | | | | |||
* | | | | | | | | | | | Merge pull request #5314 from jtattermusch/csharp_perf_removehost | Vijay Pai | 2016-02-23 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | |||
| | | * | | | | | | | | Fix copyrights | Craig Tiller | 2016-02-23 |
| | | | | | | | | | * | Merge branch 'master' of github.com:grpc/grpc into alarm_cpp | David Garcia Quintas | 2016-02-22 |
| | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |||
| | * | | | | | | | | | Merge github.com:grpc/grpc into fix-proto-docker | Craig Tiller | 2016-02-22 |
| | |\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | |||
| | | * | | | | | | | | Merge github.com:grpc/grpc into naming-crisis | Craig Tiller | 2016-02-22 |
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | | | |||
| | | * | | | | | | | | Regenerate files, fix bugs | Craig Tiller | 2016-02-22 |
| | | |\ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * \ | Merge github.com:grpc/grpc into hide-the-worker | Craig Tiller | 2016-02-22 |
| | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #5350 from yang-g/stalled_by_transport_race | Craig Tiller | 2016-02-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5287 from yang-g/global_callback_magic | Craig Tiller | 2016-02-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | | * | PR comments addressed | David Garcia Quintas | 2016-02-22 |
* | | | | | | | | | | | | | | Merge pull request #5347 from yang-g/check_error_in_read | Sree Kuchibhotla | 2016-02-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | | | * | Merge branch 'master' of github.com:grpc/grpc into alarm_cpp | David Garcia Quintas | 2016-02-22 |
| | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | |||
| | | | | | | | | | * | | | | | Merge pull request #5348 from nicolasnoble/backport-merge | Nicolas Noble | 2016-02-23 |
| | | | | | | | | | |\ \ \ \ \ | |||
* | | | | | | | | | | \ \ \ \ \ | Merge pull request #5257 from ctiller/cleaner-posix | Vijay Pai | 2016-02-22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | |||
| | | | | | | * | | | | | | | | | Add a sanity test for name aliasing | Craig Tiller | 2016-02-22 |
| | | | | | | | | | | * | | | | | Merge branch 'master' into backport-merge | Nicolas "Pixel" Noble | 2016-02-23 |
| | | | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | rename census log files to avoid build breakage on MacOS | Alistair Veitch | 2016-02-22 |
| | | | * | | | | | | | | | | | | Fix race between add_writing_stalled and destroy stream | yang-g | 2016-02-22 |
| | | | | |_|/ / / / / / / / / | | | | |/| | | | | | | | | | |