Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | Merge pull request #3083 from stanley-cheung/php_missing_build_cflags | Stanley Cheung | 2015-08-26 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | PHP: fix build failure on mac | |||
| * | | | | | | | | | | | php: fix build failure on mac | Stanley Cheung | 2015-08-26 | |
|/ / / / / / / / / / / | ||||
| | | | * | | | | | | | Fix up path | Craig Tiller | 2015-08-26 | |
| | | | | | | | | | | | ||||
| | | | * | | | | | | | Restore google test | Craig Tiller | 2015-08-26 | |
| | | | | | | | | | | | ||||
| | | | * | | | | | | | Merge github.com:grpc/grpc into endpoints | Craig Tiller | 2015-08-26 | |
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||
| | | | * | | | | | | | Turn off debug | Craig Tiller | 2015-08-26 | |
| | | | | | | | | | | | ||||
| | | | * | | | | | | | Fix refcounting | Craig Tiller | 2015-08-26 | |
| | | | | | | | | | | | ||||
* | | | | | | | | | | | Merge pull request #3081 from ctiller/under-pressure | David G. Quintas | 2015-08-26 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Up asan/tsan timeouts - they need it | |||
| * | | | | | | | | | | | Up asan/tsan timeouts - they need it | Craig Tiller | 2015-08-26 | |
| | | | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge pull request #3080 from soltanmm/docfix | Nathaniel Manista | 2015-08-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary fix on Python doc to alleviate confusion. | |||
| * | | | | | | | | | | | | Temporary fix on Python doc to alleviate confusion | Masood Malekghassemi | 2015-08-26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc grpc/grpc-common#274, #2896 | |||
* | | | | | | | | | | | | | Merge pull request #3044 from ↵ | Masood Malekghassemi | 2015-08-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nathanielmanistaatgoogle/no-such-method-code-and-message Add code and message to base.NoSuchMethodError | |||
| | | | | | | * \ \ \ \ \ \ | Merge github.com:grpc/grpc into endpoints | Craig Tiller | 2015-08-26 | |
| | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/iomgr/tcp_windows.c | |||
| | | | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into string_ref_auth | yang-g | 2015-08-26 | |
| | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | Merge pull request #3072 from ctiller/pneumatic-figure-skater | Vijay Pai | 2015-08-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup test, initialize correctly | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #3079 from ctiller/scrubbing-the-floor | Yang Gao | 2015-08-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | Add ostream support for string_ref | |||
| * | | | | | | | | | | | | | | Add ostream support for string_ref | Craig Tiller | 2015-08-26 | |
|/ / / / / / / / / / / / / / | ||||
| | | | | | | | * | | | | | | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | Jan Tattermusch | 2015-08-26 | |
| | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/csharp/Grpc.IntegrationTesting/InteropClient.cs | |||
* | | | | | | | | | | | | | | Merge pull request #3065 from yang-g/string_ref | Craig Tiller | 2015-08-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use string_ref for incoming metadata | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #3048 from maxwell-demon/timespec | Craig Tiller | 2015-08-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move core/profiling/timers_preciseclock.h to core/support/ such that we | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #3078 from ctiller/the-jackal-winked-at-the-moose | David G. Quintas | 2015-08-26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make run_tests.py robust against port_server not starting | |||
| * | | | | | | | | | | | | | | | | Fix typo | Craig Tiller | 2015-08-26 | |
| | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | Make run_tests.py robust against port_server not starting | Craig Tiller | 2015-08-26 | |
|/ / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | Merge pull request #3035 from ctiller/naming-crisis | David G. Quintas | 2015-08-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor default host name resolution | |||
| | | | | | | | | | | | | * | | | | Fixing PHP. | Julien Boeuf | 2015-08-25 | |
| | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | * | | | | Fixing tests. | Julien Boeuf | 2015-08-25 | |
| | | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #3054 from ctiller/openssl-just-needs-to-build | David G. Quintas | 2015-08-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont try to parallelize OpenSSL build | |||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #3073 from jtattermusch/appdomain_unloaded_exception | Michael Lumish | 2015-08-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent occasional AppDomainUnloadedException from nunit | |||
| * | | | | | | | | | | | | | | | | | | prevent occasional AppDomainUnloadedException from nunit | Jan Tattermusch | 2015-08-25 | |
| | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | * | | | | Adding void* at then end of security related method in order to have a ↵ | Julien Boeuf | 2015-08-25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stable ABI. | |||
* | | | | | | | | | | | | | | | | | | | Merge pull request #3068 from ctiller/make-might-take-a-very-long-time | Jan Tattermusch | 2015-08-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | Windows builds need longer | |||
| | | | | | | * | | | | | | | | | | | | Cleanup test, initialize correctly | Craig Tiller | 2015-08-25 | |
| |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test was failing on mac because gpr time code was not initialized. Whilst here, clean up the test so that I can understand it again. | |||
| | | | | | | | | * | | | | | | | | | auth context api change for string_ref | yang-g | 2015-08-25 | |
| | | | | | | |_|/ / / / / / / / / | | | | | | |/| | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | More merge conflict fix | Hongyu Chen | 2015-08-25 | |
| | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | * | | | | Merge branch 'master' of https://github.com/grpc/grpc into grpc_security_abi | Julien Boeuf | 2015-08-25 | |
| | | | | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #3021 from ctiller/reject-the-stuffs | Yang Gao | 2015-08-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Outlaw illegal metadata characters | |||
| | | | | | | | | | | | | * | | | | | Make C core log output readable | Craig Tiller | 2015-08-25 | |
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | * | update doc | yang-g | 2015-08-25 | |
| | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | * | | | | | | | The RPC Framework crust package | Nathaniel Manista | 2015-08-25 | |
| | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | * | fix route_guide | yang-g | 2015-08-25 | |
| | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | * | fix helloworld | yang-g | 2015-08-25 | |
| | | | | | | | | | | | | | | |/ | ||||
* | | | | | | | | | | | | | | | | Merge pull request #3067 from dgquintas/interop_streaming_fix | Yang Gao | 2015-08-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing payloads to streaming compressed test | |||
| | | | | | | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | ||||
* | | | | | | | | | | | | | | | | | Merge pull request #3059 from soltanmm/timeout | Nathaniel Manista | 2015-08-25 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Add per-test timeouts to Python test harness. | |||
| | | | * | | | | | | | | | | | | | Windows builds need longer | Craig Tiller | 2015-08-25 | |
| |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||
| | * | | | | | | | | | | | | | | Added missing payloads to streaming compressed test | David Garcia Quintas | 2015-08-25 | |
| | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | Merge github.com:grpc/grpc into openssl-just-needs-to-build | Craig Tiller | 2015-08-25 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into string_ref | yang-g | 2015-08-25 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | ||||
| | | | | * | | | | | | | | | | | Merge github.com:grpc/grpc into naming-crisis | Craig Tiller | 2015-08-25 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |