aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #11348 from matt-kwong/upload_windowsGravatar Matt Kwong2017-05-31
|\ | | | | Enable uploading more test results to BQ
* \ Merge pull request #11269 from ncteisen/bm-trickle-bugfixesGravatar Noah Eisen2017-05-31
|\ \ | | | | | | Bugfix for bm_trickle
| | * Fix --measure_cpu_costs flag in run_tests.py on WindowsGravatar Matt Kwong2017-05-31
| | |
* | | Merge pull request #11337 from makdharma/win_bldfixGravatar makdharma2017-05-31
|\ \ \ | | | | | | | | s/inline/__inline/. Visual studio incompateblity.
| * | | clang-formatGravatar Mak Dharma2017-05-30
| | | |
| * | | Merge branch 'win_bldfix' of https://github.com/makdharma/grpc into win_bldfixGravatar Mak Dharma2017-05-30
| |\ \ \
* | \ \ \ Merge pull request #11339 from dgquintas/master-to-1.5Gravatar David G. Quintas2017-05-30
|\ \ \ \ \ | |/ / / / |/| | | | master bumped to 1.5.x
| | * | | s/inline/__inline/Gravatar Makarand Dharmapurikar2017-05-30
| | | | |
| * | | | master bumped to 1.5.xGravatar David Garcia Quintas2017-05-30
|/ / / /
| * | | s/inline/__inline/. Visual studio incompatiblity.Gravatar Makarand Dharmapurikar2017-05-30
| | | | | | | | | | | | | | | | | | | | | | | | MS Visual studio '13 and before don't understand inline and throw Error C2054. Reference: https://msdn.microsoft.com/en-us/library/bw1hbe6y.aspx
* | | | Merge pull request #11309 from murgatroid99/master_1.3.x_upmergeGravatar Michael Lumish2017-05-30
|\ \ \ \ | |/ / / |/| | | Master 1.3.x upmerge
* | | | Merge pull request #11318 from ctiller/eintrGravatar Craig Tiller2017-05-30
|\ \ \ \ | | | | | | | | | | Make jobset more eintr resilient
| | * \ \ Merge pull request #3 from apolcyn/flake_fix_masterGravatar Michael Lumish2017-05-30
| | |\ \ \ | | | | | | | | | | | | Get rid of flakey asserts in num_watchers test
* | | \ \ \ Merge pull request #11272 from jtattermusch/csharp_microbenchmarksGravatar Jan Tattermusch2017-05-26
|\ \ \ \ \ \ | | | | | | | | | | | | | | C# add microbenchmarks project
| * | | | | | address commentsGravatar Jan Tattermusch2017-05-26
| | | | | | |
| | | | * | | get rid of flakey asserts in num_watchers testGravatar Alexander Polcyn2017-05-26
| | | |/ / /
* | | | | | Merge pull request #11315 from ncteisen/nitGravatar Noah Eisen2017-05-26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove uneeded ref/unref
* \ \ \ \ \ \ Merge pull request #11313 from apolcyn/fix_sanityGravatar apolcyn2017-05-26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix sanity
* \ \ \ \ \ \ \ Merge pull request #11319 from makdharma/clang-fixGravatar makdharma2017-05-26
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | clang-format and include guard fix
| * | | | | | | | clang-format and include guard fixGravatar Makarand Dharmapurikar2017-05-26
|/ / / / / / / /
| | | | * / / / Make jobset more eintr resilientGravatar Craig Tiller2017-05-26
| |_|_|/ / / / |/| | | | | |
| | | | | * | FixesGravatar ncteisen2017-05-26
| | | | | | |
| | | | | * | bm trickly bugfixGravatar ncteisen2017-05-26
| |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #11303 from jtattermusch/improve_contributingGravatar Jan Tattermusch2017-05-26
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improve contributing guidelines
| | | * | | | Remove uneeded ref/unrefGravatar ncteisen2017-05-26
| |_|/ / / / |/| | | | |
| | * | | | fix format of include guardsGravatar Alexander Polcyn2017-05-25
| | | | | |
| | * | | | rerun clang format code.shGravatar Alexander Polcyn2017-05-25
| | | | | |
| | * | | | add missing copyright headersGravatar Alexander Polcyn2017-05-25
| |/ / / / |/| | | |
| | | * | Fix node cancellation testsGravatar murgatroid992017-05-25
| | | | |
| | | * | Fix concurrent_connectivity_testGravatar murgatroid992017-05-25
| | | | |
| | | * | Merge remote-tracking branch 'upstream/v1.3.x' into master_1.3.x_upmergeGravatar murgatroid992017-05-25
| | | |\ \
* | | | \ \ Merge pull request #11306 from kpayson64/python_reflectionGravatar kpayson642017-05-25
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix Python reflection arguments
| | | | | * \ Merge pull request #11304 from murgatroid99/node_call_lifetime_fixesGravatar Michael Lumish2017-05-25
| | | | | |\ \ | | | | | | | | | | | | | | | | Add more null checks to call methods
| * | | | | | | Fix Python reflection argumentsGravatar Ken Payson2017-05-25
| | | | | | | |
* | | | | | | | Merge pull request #11224 from makdharma/http_proxy_test_fixGravatar makdharma2017-05-25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixes #9542
| | | | | | | * | Add more null checks to call methodsGravatar murgatroid992017-05-25
| | | | | | |/ /
| | | * | | / / improve CONTRIBUTING.md and add rules for PRsGravatar Jan Tattermusch2017-05-25
| |_|/ / / / / |/| | | | | |
| | | | | * | Merge pull request #11283 from jtattermusch/bump_136Gravatar Jan Tattermusch2017-05-25
| | | | | |\ \ | | | | | | | | | | | | | | | | bump version to 1.3.6
| | | | | * \ \ Merge pull request #11282 from jtattermusch/csharp_better_nugetsGravatar Jan Tattermusch2017-05-25
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | Fix transitive inclusion of native libs in C# nugets
* | | | | | \ \ \ Merge pull request #11300 from grpc/fengli79-patch-1Gravatar Feng Li2017-05-24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove the section for b64 encoded trailers.
| * | | | | | | | | Remove the section for b64 encoded trailers.Gravatar Feng Li2017-05-24
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | Remove the section for b64 encoded trailers. As gRPC-Web uses CRLF to separate the trailers in the trailers frame, a binary trailer need to reserve in a base64 encoded format for their values. This cannot be skipped even base64 is applied on the whole trailers frame per client's request via content-type: application/grpc-web-text.
* | | | | | | | | Merge pull request #10920 from Vizerai/intrusive_hash_mapGravatar Jim King2017-05-24
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Intrusive hash map
| * | | | | | | | | updateGravatar Vizerai2017-05-24
| | | | | | | | | |
* | | | | | | | | | Merge pull request #11285 from ctiller/refcGravatar Craig Tiller2017-05-24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Refcounting fix
* \ \ \ \ \ \ \ \ \ \ Merge pull request #10925 from jiangtaoli2016/handshakerGravatar Mark D. Roth2017-05-24
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update security_handshaker to use new TSI
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #11280 from murgatroid99/node_api_docsGravatar Michael Lumish2017-05-23
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | Refactor some code and document most of the API
| | | * | | | | | | | | Add missing refGravatar Craig Tiller2017-05-23
| | | | | | | | | | | |
| | | | * | | | | | | | updateGravatar Vizerai2017-05-23
| | | | | | | | | | | |
| | | * | | | | | | | | Refcounting fixGravatar Craig Tiller2017-05-23
| |_|/ / / / / / / / / |/| | | | | | | | | |
| | | * | | | | | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_mapGravatar Vizerai2017-05-23
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |