aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #3090 from maxwell-demon/masterGravatar Alistair Veitch2015-08-27
|\
* \ Merge pull request #3095 from grpc/revert-3025-endpointsGravatar Craig Tiller2015-08-27
|\ \
| * | Revert "Refactor Endpoint API"Gravatar Craig Tiller2015-08-27
|/ /
* | Merge pull request #3025 from ctiller/endpointsGravatar Yang Gao2015-08-26
|\ \
* \ \ Merge pull request #3094 from yang-g/string_ref_authGravatar jboeuf2015-08-26
|\ \ \
| * | | minor fixesGravatar yang-g2015-08-26
|/ / /
* | | Merge pull request #3052 from nathanielmanistaatgoogle/crustGravatar Masood Malekghassemi2015-08-27
|\ \ \
| | | * Fix include guard of census/grpc_filter.hGravatar Hongyu Chen2015-08-26
| |_|/ |/| |
* | | Merge pull request #3086 from ctiller/radio-ga-gaGravatar David G. Quintas2015-08-26
|\ \ \
| * | | Increase msan timeout alsoGravatar Craig Tiller2015-08-26
|/ / /
| | * Properly reset incoming bufferGravatar Craig Tiller2015-08-26
| | * Merge branch 'endpoints' of github.com:ctiller/grpc into endpointsGravatar Craig Tiller2015-08-26
| | |\
| | * | Fix uninitialized dataGravatar Craig Tiller2015-08-26
* | | | Merge pull request #3077 from yang-g/string_ref_authGravatar Craig Tiller2015-08-26
|\ \ \ \
* \ \ \ \ Merge pull request #3085 from crast/fix-googletest-submoduleGravatar Yang Gao2015-08-26
|\ \ \ \ \
| * | | | | Use https like all the other submodulesGravatar James Crasta2015-08-26
|/ / / / /
| | | | * Make port_windows compile againGravatar Craig Tiller2015-08-26
| | | |/
* | | | Merge pull request #2993 from murgatroid99/node_server_graceful_shutdownGravatar Tim Emiola2015-08-26
|\ \ \ \
| | | | * Use port server on windowsGravatar Craig Tiller2015-08-26
| | | | * Merge github.com:grpc/grpc into endpointsGravatar Craig Tiller2015-08-26
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #3083 from stanley-cheung/php_missing_build_cflagsGravatar Stanley Cheung2015-08-26
|\ \ \ \ \
| * | | | | 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 itGravatar Craig Tiller2015-08-26
* | | | | | Merge pull request #3080 from soltanmm/docfixGravatar Nathaniel Manista2015-08-26
|\ \ \ \ \ \
| * | | | | | Temporary fix on Python doc to alleviate confusionGravatar Masood Malekghassemi2015-08-26
* | | | | | | Merge pull request #3044 from nathanielmanistaatgoogle/no-such-method-code-an...Gravatar Masood Malekghassemi2015-08-26
|\ \ \ \ \ \ \
| | | | | | | * Merge github.com:grpc/grpc into endpointsGravatar Craig Tiller2015-08-26
| | | | | | | |\ | |_|_|_|_|_|_|/ |/| | | | | | |
| | | | | * | | 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
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #3079 from ctiller/scrubbing-the-floorGravatar Yang Gao2015-08-26
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Add ostream support for string_refGravatar Craig Tiller2015-08-26
|/ / / / / / / /
* | | | | | | | Merge pull request #3065 from yang-g/string_refGravatar Craig Tiller2015-08-26
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #3048 from maxwell-demon/timespecGravatar Craig Tiller2015-08-26
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge pull request #3078 from ctiller/the-jackal-winked-at-the-mooseGravatar David G. Quintas2015-08-26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge pull request #3054 from ctiller/openssl-just-needs-to-buildGravatar David G. Quintas2015-08-25
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #3073 from jtattermusch/appdomain_unloaded_exceptionGravatar Michael Lumish2015-08-25
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | prevent occasional AppDomainUnloadedException from nunitGravatar Jan Tattermusch2015-08-25
* | | | | | | | | | | | | Merge pull request #3068 from ctiller/make-might-take-a-very-long-timeGravatar Jan Tattermusch2015-08-25
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| | | | | | | * | | | | | Cleanup test, initialize correctlyGravatar Craig Tiller2015-08-25
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| | | | | | | | | * | | auth context api change for string_refGravatar yang-g2015-08-25
| | | | | | | |_|/ / / | | | | | | |/| | | |
| | | | | * | | | | | More merge conflict fixGravatar Hongyu Chen2015-08-25