Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'win_bldfix' of https://github.com/makdharma/grpc into win_bldfix | Mak Dharma | 2017-05-30 |
|\ | |||
| * | s/inline/__inline/ | Makarand Dharmapurikar | 2017-05-30 |
| * | s/inline/__inline/. Visual studio incompatiblity. | Makarand Dharmapurikar | 2017-05-30 |
* | | Merge pull request #11309 from murgatroid99/master_1.3.x_upmerge | Michael Lumish | 2017-05-30 |
|\ \ | |/ |/| | |||
* | | Merge pull request #11318 from ctiller/eintr | Craig Tiller | 2017-05-30 |
|\ \ | |||
| | * | Merge pull request #3 from apolcyn/flake_fix_master | Michael Lumish | 2017-05-30 |
| | |\ | |||
* | | \ | Merge pull request #11272 from jtattermusch/csharp_microbenchmarks | Jan Tattermusch | 2017-05-26 |
|\ \ \ \ | |||
| * | | | | address comments | Jan Tattermusch | 2017-05-26 |
| | | | * | get rid of flakey asserts in num_watchers test | Alexander Polcyn | 2017-05-26 |
| | | |/ | |||
* | | | | Merge pull request #11315 from ncteisen/nit | Noah Eisen | 2017-05-26 |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #11313 from apolcyn/fix_sanity | apolcyn | 2017-05-26 |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge pull request #11319 from makdharma/clang-fix | makdharma | 2017-05-26 |
|\ \ \ \ \ \ | |||
| * | | | | | | clang-format and include guard fix | Makarand Dharmapurikar | 2017-05-26 |
|/ / / / / / | |||
| | | | * / | Make jobset more eintr resilient | Craig Tiller | 2017-05-26 |
| |_|_|/ / |/| | | | | |||
* | | | | | Merge pull request #11303 from jtattermusch/improve_contributing | Jan Tattermusch | 2017-05-26 |
|\ \ \ \ \ | |||
| | | * | | | Remove uneeded ref/unref | ncteisen | 2017-05-26 |
| |_|/ / / |/| | | | | |||
| | * | | | fix format of include guards | Alexander Polcyn | 2017-05-25 |
| | * | | | rerun clang format code.sh | Alexander Polcyn | 2017-05-25 |
| | * | | | add missing copyright headers | Alexander Polcyn | 2017-05-25 |
| |/ / / |/| | | | |||
| | | * | Fix node cancellation tests | murgatroid99 | 2017-05-25 |
| | | * | Fix concurrent_connectivity_test | murgatroid99 | 2017-05-25 |
| | | * | Merge remote-tracking branch 'upstream/v1.3.x' into master_1.3.x_upmerge | murgatroid99 | 2017-05-25 |
| | | |\ | |||
* | | | \ | Merge pull request #11306 from kpayson64/python_reflection | kpayson64 | 2017-05-25 |
|\ \ \ \ \ | |||
| | | | | * | Merge pull request #11304 from murgatroid99/node_call_lifetime_fixes | Michael Lumish | 2017-05-25 |
| | | | | |\ | |||
| * | | | | | | Fix Python reflection arguments | Ken Payson | 2017-05-25 |
* | | | | | | | Merge pull request #11224 from makdharma/http_proxy_test_fix | makdharma | 2017-05-25 |
|\ \ \ \ \ \ \ | |||
| | | | | | | * | Add more null checks to call methods | murgatroid99 | 2017-05-25 |
| | | | | | |/ | |||
| | | * | | / | improve CONTRIBUTING.md and add rules for PRs | Jan Tattermusch | 2017-05-25 |
| |_|/ / / / |/| | | | | | |||
| | | | | * | Merge pull request #11283 from jtattermusch/bump_136 | Jan Tattermusch | 2017-05-25 |
| | | | | |\ | |||
| | | | | * \ | Merge pull request #11282 from jtattermusch/csharp_better_nugets | Jan Tattermusch | 2017-05-25 |
| | | | | |\ \ | |||
* | | | | | \ \ | Merge pull request #11300 from grpc/fengli79-patch-1 | Feng Li | 2017-05-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | Remove the section for b64 encoded trailers. | Feng Li | 2017-05-24 |
|/ / / / / / / / | |||
* | | | | | | | | Merge pull request #10920 from Vizerai/intrusive_hash_map | Jim King | 2017-05-24 |
|\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | update | Vizerai | 2017-05-24 |
* | | | | | | | | | Merge pull request #11285 from ctiller/refc | Craig Tiller | 2017-05-24 |
|\ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ | Merge pull request #10925 from jiangtaoli2016/handshaker | Mark D. Roth | 2017-05-24 |
|\ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ | Merge pull request #11280 from murgatroid99/node_api_docs | Michael Lumish | 2017-05-23 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||
| | | * | | | | | | | | Add missing ref | Craig Tiller | 2017-05-23 |
| | | | * | | | | | | | update | Vizerai | 2017-05-23 |
| | | * | | | | | | | | Refcounting fix | Craig Tiller | 2017-05-23 |
| |_|/ / / / / / / / |/| | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map | Vizerai | 2017-05-23 |
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | |||
* | | | | | | | | | | Merge pull request #11158 from yang-g/async_default_service | Yang Gao | 2017-05-23 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | bump version to 1.3.6 | Jan Tattermusch | 2017-05-23 |
| | | | | | | | | |/ | | | | | | | | |/| | |||
* | | | | | | | | | | Merge pull request #11281 from ctiller/nuts | Craig Tiller | 2017-05-23 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | Fix sanity | Craig Tiller | 2017-05-23 |
|/ / / / / / / / / / | |||
* | | | | | | | | | | Merge pull request #11262 from KindDragon/patch-1 | Craig Tiller | 2017-05-23 |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | * | remove now unnecessary extra args | Jan Tattermusch | 2017-05-23 |
| | | | | | | | | | * | include symbols and source in nugets | Jan Tattermusch | 2017-05-23 |
| | | | | | | | | | * | add privateassets none to C# nugets depending on Grpc.Core | Jan Tattermusch | 2017-05-23 |
| | | | | | | | | |/ | |||
| | | | * | | | | | | Revise handshaker to make callback once a time. | jiangtaoli2016 | 2017-05-23 |