aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* | | | | | | | | | | Merge pull request #3083 from stanley-cheung/php_missing_build_cflagsGravatar Stanley Cheung2015-08-26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | PHP: fix build failure on mac
| * | | | | | | | | | | php: fix build failure on macGravatar Stanley Cheung2015-08-26
|/ / / / / / / / / / /
| | | | * | | | | | | Fix up pathGravatar Craig Tiller2015-08-26
| | | | | | | | | | |
| | | | * | | | | | | Restore google testGravatar Craig Tiller2015-08-26
| | | | | | | | | | |
| | | | * | | | | | | Merge github.com:grpc/grpc into endpointsGravatar Craig Tiller2015-08-26
| | | | |\ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| | | | * | | | | | | Turn off debugGravatar Craig Tiller2015-08-26
| | | | | | | | | | |
| | | | * | | | | | | Fix refcountingGravatar Craig Tiller2015-08-26
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #3081 from ctiller/under-pressureGravatar David G. Quintas2015-08-26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Up asan/tsan timeouts - they need it
| * | | | | | | | | | | Up asan/tsan timeouts - they need itGravatar Craig Tiller2015-08-26
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #3080 from soltanmm/docfixGravatar Nathaniel Manista2015-08-26
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Temporary fix on Python doc to alleviate confusion.
| * | | | | | | | | | | | Temporary fix on Python doc to alleviate confusionGravatar Masood Malekghassemi2015-08-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc grpc/grpc-common#274, #2896
* | | | | | | | | | | | | Merge pull request #3044 from ↵Gravatar Masood Malekghassemi2015-08-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nathanielmanistaatgoogle/no-such-method-code-and-message Add code and message to base.NoSuchMethodError
| | | | | | | * \ \ \ \ \ \ Merge github.com:grpc/grpc into endpointsGravatar Craig Tiller2015-08-26
| | | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/iomgr/tcp_windows.c
| | | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into string_ref_authGravatar yang-g2015-08-26
| | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #3072 from ctiller/pneumatic-figure-skaterGravatar Vijay Pai2015-08-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup test, initialize correctly
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3079 from ctiller/scrubbing-the-floorGravatar Yang Gao2015-08-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | Add ostream support for string_ref
| * | | | | | | | | | | | | | Add ostream support for string_refGravatar Craig Tiller2015-08-26
|/ / / / / / / / / / / / / /
| | | | | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3Gravatar Jan Tattermusch2015-08-26
| | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/csharp/Grpc.IntegrationTesting/InteropClient.cs
* | | | | | | | | | | | | | Merge pull request #3065 from yang-g/string_refGravatar Craig Tiller2015-08-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use string_ref for incoming metadata
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3048 from maxwell-demon/timespecGravatar Craig Tiller2015-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-mooseGravatar David G. Quintas2015-08-26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make run_tests.py robust against port_server not starting
| * | | | | | | | | | | | | | | | Fix typoGravatar Craig Tiller2015-08-26
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Make run_tests.py robust against port_server not startingGravatar Craig Tiller2015-08-26
|/ / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | Merge pull request #3035 from ctiller/naming-crisisGravatar David G. Quintas2015-08-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor default host name resolution
| | | | | | | | | | | | | * | | | Fixing PHP.Gravatar Julien Boeuf2015-08-25
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | Fixing tests.Gravatar Julien Boeuf2015-08-25
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3054 from ctiller/openssl-just-needs-to-buildGravatar David G. Quintas2015-08-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dont try to parallelize OpenSSL build
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3073 from jtattermusch/appdomain_unloaded_exceptionGravatar Michael Lumish2015-08-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent occasional AppDomainUnloadedException from nunit
| * | | | | | | | | | | | | | | | | | prevent occasional AppDomainUnloadedException from nunitGravatar Jan Tattermusch2015-08-25
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | * | | | Adding void* at then end of security related method in order to have a ↵Gravatar Julien Boeuf2015-08-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stable ABI.
* | | | | | | | | | | | | | | | | | | Merge pull request #3068 from ctiller/make-might-take-a-very-long-timeGravatar Jan Tattermusch2015-08-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | Windows builds need longer
| | | | | | | * | | | | | | | | | | | Cleanup test, initialize correctlyGravatar Craig Tiller2015-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_refGravatar yang-g2015-08-25
| | | | | | | |_|/ / / / / / / / / | | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | | More merge conflict fixGravatar Hongyu Chen2015-08-25
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into grpc_security_abiGravatar Julien Boeuf2015-08-25
| | | | | | | | | | | | | |\ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into timespecGravatar Hongyu Chen2015-08-25
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3021 from ctiller/reject-the-stuffsGravatar Yang Gao2015-08-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Outlaw illegal metadata characters
| | | | | | | | | | | | | * | | | | Make C core log output readableGravatar Craig Tiller2015-08-25
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * update docGravatar yang-g2015-08-25
| | | | | | | | | | | | | | | | |
| | | | | | | | | | * | | | | | | The RPC Framework crust packageGravatar Nathaniel Manista2015-08-25
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * fix route_guideGravatar yang-g2015-08-25
| | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | * fix helloworldGravatar yang-g2015-08-25
| | | | | | | | | | | | | | | |/
* | | | | | | | | | | | | | | | Merge pull request #3067 from dgquintas/interop_streaming_fixGravatar Yang Gao2015-08-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing payloads to streaming compressed test
| | | | | | | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into timespecGravatar Hongyu Chen2015-08-25
| | | | | | | |\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge pull request #3059 from soltanmm/timeoutGravatar Nathaniel Manista2015-08-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | Add per-test timeouts to Python test harness.
| | | | * | | | | | | | | | | | | Windows builds need longerGravatar Craig Tiller2015-08-25
| |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Added missing payloads to streaming compressed testGravatar David Garcia Quintas2015-08-25
| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge github.com:grpc/grpc into openssl-just-needs-to-buildGravatar Craig Tiller2015-08-25
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| | | | | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into string_refGravatar yang-g2015-08-25
| | | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | Merge github.com:grpc/grpc into naming-crisisGravatar Craig Tiller2015-08-25
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |