aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Update version to 1.3.1Gravatar murgatroid992017-05-04
* Merge pull request #10959 from murgatroid99/node_rollback_protobuf6Gravatar Michael Lumish2017-05-03
|\
| * Fix a bit of documentation that doesn't apply to Protobuf.js 5Gravatar murgatroid992017-05-02
| * Switch Protobuf.js dependency back to version 5Gravatar murgatroid992017-05-02
|/
* Merge pull request #10904 from jtattermusch/nuget_include_sources_and_symbolsGravatar Jan Tattermusch2017-05-02
|\
* \ Merge pull request #10895 from dgquintas/v1.3.x-post-tag-bumpGravatar David G. Quintas2017-04-28
|\ \
| | * include sources and symbols in C# nugetsGravatar Jan Tattermusch2017-04-28
| |/ |/|
| * 1.3.0 -> 1.3.1-pre1Gravatar David Garcia Quintas2017-04-27
|/
* s/1.3.0-pre/1.3.0Gravatar David Garcia Quintas2017-04-27
* Merge pull request #10884 from matt-kwong/fix_1.3.x_testsGravatar Matt Kwong2017-04-27
|\
* \ Merge pull request #10825 from murgatroid99/node_only_uvGravatar Michael Lumish2017-04-27
|\ \
| | * Fix C/C++ test filteringGravatar Matt Kwong2017-04-27
| | * Add test filtering to performance pull requestsGravatar Matt Kwong2017-04-27
| | * Extend time capping to run_tests_matrix scriptsGravatar Craig Tiller2017-04-27
| |/ |/|
* | Merge pull request #10847 from matt-kwong/cherry-pick_max_timeGravatar Matt Kwong2017-04-26
|\ \
| | * Remove extra header from node_grpc.ccGravatar murgatroid992017-04-26
| | * Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uvGravatar murgatroid992017-04-26
| | |\ | |_|/ |/| |
* | | Merge pull request #10871 from apolcyn/revert_merge_from_master_into_13xGravatar David G. Quintas2017-04-26
|\ \ \
| * | | Revert "Merge branch 'master' into v1.3.x"Gravatar Alexander Polcyn2017-04-26
|/ / /
| * | Allow specifying a maximum run time to run_testsGravatar Craig Tiller2017-04-25
| | * Clang formatGravatar murgatroid992017-04-25
| | * Remove another instance of '#ifdef GRPC_UV' from Node extensionGravatar murgatroid992017-04-25
| | * Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uvGravatar murgatroid992017-04-25
| | |\ | |_|/ |/| |
* | | Merge branch 'master' into v1.3.xGravatar Yuchen Zeng2017-04-25
|\ \ \
| | | * Remove another from Node extensionGravatar murgatroid992017-04-25
| | | * Removed another couple of uses of '--iomgr_platform=uv'Gravatar murgatroid992017-04-25
| * | | Merge pull request #10844 from ctiller/PSCGravatar Craig Tiller2017-04-25
| |\ \ \
| | * | | Ensure port server can shutdownGravatar Craig Tiller2017-04-25
| | * | | Ensure port server runningGravatar Craig Tiller2017-04-25
| | * | | Recycle portsGravatar Craig Tiller2017-04-25
| | * | | Be resilient against failed runsGravatar Craig Tiller2017-04-25
| | * | | Allow a longer fetch time for port serverGravatar Craig Tiller2017-04-25
| |/ / /
| * | | Merge pull request #10822 from ctiller/threaded_port_serverGravatar Craig Tiller2017-04-24
| |\ \ \
| * \ \ \ Merge pull request #10826 from ctiller/ubsanGravatar Craig Tiller2017-04-24
| |\ \ \ \
| * \ \ \ \ Merge pull request #10644 from MakMukhi/masterGravatar MakMukhi2017-04-24
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #10764 from makdharma/v1.3.xGravatar makdharma2017-04-24
|\ \ \ \ \ \ \
| | * \ \ \ \ \ Merge pull request #10796 from danzh2010/udpserver2Gravatar Yang Gao2017-04-24
| | |\ \ \ \ \ \
| | | | | | * | | Add a mutex around allocate_portGravatar Craig Tiller2017-04-24
| | | | | * | | | Slow down timers for ubsan buildsGravatar Craig Tiller2017-04-24
| | | |_|/ / / / | | |/| | | | |
| | | | | | | * Remove non-libuv code from Node extensionGravatar murgatroid992017-04-24
| |_|_|_|_|_|/ |/| | | | | |
| | * | | | | Merge pull request #10584 from ctiller/hybridGravatar Craig Tiller2017-04-24
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge pull request #10799 from vjpai/buildhealthGravatar Vijay Pai2017-04-24
| | |\ \ \ \ \ \
| | | | | | | * | Threaded port_serverGravatar Craig Tiller2017-04-24
| | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | Merge pull request #10258 from markdroth/service_config_lb_semanticsGravatar Mark D. Roth2017-04-24
| | |\ \ \ \ \ \
| | | | | * | | | Rollback some changesGravatar Craig Tiller2017-04-24
| | | | | * | | | Rollback some changesGravatar Craig Tiller2017-04-24
| | | | | * | | | Merge branch 'hybrid' of github.com:ctiller/grpc into hybridGravatar Craig Tiller2017-04-24
| | | | | |\ \ \ \
| | | | | * \ \ \ \ Merge github.com:grpc/grpc into hybridGravatar Craig Tiller2017-04-24
| | | | | |\ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge pull request #10802 from ctiller/proxyGravatar Craig Tiller2017-04-22
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Remove more spamGravatar Craig Tiller2017-04-21