aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #5700 from bluecmd/ssl-defaultsGravatar Jan Tattermusch2016-03-31
|\
* \ Merge pull request #6041 from vjpai/i_know_virtual_destructorsGravatar Jan Tattermusch2016-03-31
|\ \
* \ \ Merge pull request #6034 from dgquintas/uri_query_partsGravatar Nicolas Noble2016-03-31
|\ \ \
* \ \ \ Merge pull request #5955 from jtattermusch/clearer_onconnect_msgGravatar Nicolas Noble2016-03-31
|\ \ \ \
* \ \ \ \ Merge pull request #6039 from ctiller/copyright-fixGravatar Nicolas Noble2016-03-31
|\ \ \ \ \
| * \ \ \ \ Merge github.com:grpc/grpc into copyright-fixGravatar Craig Tiller2016-03-31
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| | | | * | Merge branch 'master' into i_know_virtual_destructorsGravatar Vijay Pai2016-03-31
| | | | |\ \ | |_|_|_|/ / |/| | | | |
| | | | * | Add virtual destructor to satisfy a requirement of some compilersGravatar vjpai2016-03-31
* | | | | | Merge pull request #5943 from vjpai/make_unix_sockets_great_againGravatar Nicolas Noble2016-03-31
|\ \ \ \ \ \
| | | | * \ \ Merge branch 'master' of github.com:grpc/grpc into uri_query_partsGravatar David Garcia Quintas2016-03-31
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
| | | | * | | Added grpc_uri_get_query_arg per comments.Gravatar David Garcia Quintas2016-03-31
* | | | | | | Merge pull request #6000 from ctiller/optionalize_roundrobinGravatar Nicolas Noble2016-03-31
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| | | * | | | Merge github.com:grpc/grpc into copyright-fixGravatar Craig Tiller2016-03-31
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
| | | * | | | Update copyrightsGravatar Craig Tiller2016-03-31
| | | * | | | Update toolGravatar Craig Tiller2016-03-31
| | | | | * | Added & and = to URI queriesGravatar David Garcia Quintas2016-03-30
* | | | | | | Merge pull request #6030 from nicolasnoble/upmergeGravatar Nicolas Noble2016-03-30
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Merge branch 'release-0_13' into upmergeGravatar Nicolas "Pixel" Noble2016-03-31
|/| | | | | |
| * | | | | | Merge pull request #6031 from nicolasnoble/0.13.2-pre1Gravatar Nicolas Noble2016-03-30
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge pull request #5691 from ctiller/idempotentGravatar Nicolas Noble2016-03-30
|\ \ \ \ \ \ \ \
| | | * | | | | | The release-0_13 branch is now 0.13.2-pre1.Gravatar Nicolas "Pixel" Noble2016-03-31
| | |/ / / / / /
* | | | | | | | Merge pull request #5699 from ctiller/accountingGravatar Bogdan Drutu2016-03-30
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #5764 from ctiller/internal-canaryGravatar Nicolas Noble2016-03-30
|\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ Merge pull request #6026 from nicolasnoble/flagging-0.13.1Gravatar Nicolas Noble2016-03-30
| | | | |\ \ \ \ \ \
* | | | | \ \ \ \ \ \ Merge pull request #5984 from jtattermusch/perf_tests_scriptGravatar Jan Tattermusch2016-03-30
|\ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6021 from grpc/release-0_13Gravatar Nicolas Noble2016-03-30
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #5894 from soltanmm/stop-thatGravatar Jan Tattermusch2016-03-30
|\ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6025 from jtattermusch/csharp_refactor_building_take2Gravatar Jan Tattermusch2016-03-30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ Merge branch 'master' into optionalize_roundrobinGravatar Craig Tiller2016-03-30
| | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | dont break mac build by EMBED_ZLIB=true againGravatar Jan Tattermusch2016-03-30
| * | | | | | | | | | | | | make C# mac build use same args as in artifact builderGravatar Jan Tattermusch2016-03-30
| | | | | | | | * | | | | | Flagging the 0.13.1 release.Gravatar Nicolas "Pixel" Noble2016-03-30
| | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5966 from jtattermusch/interop_worker_scriptGravatar adelez2016-03-30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add a comment.Gravatar Jan Tattermusch2016-03-30
| | * | | | | | | | | | | | dont break the mac buildGravatar Jan Tattermusch2016-03-30
| | * | | | | | | | | | | | disable C# arch choosing for nowGravatar Jan Tattermusch2016-03-30
| | * | | | | | | | | | | | refactor C# buildingGravatar Jan Tattermusch2016-03-30
| | * | | | | | | | | | | | polish some .bat filesGravatar Jan Tattermusch2016-03-30
| | * | | | | | | | | | | | always embed zlib and openssl for C#Gravatar Jan Tattermusch2016-03-30
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| | | | | | * | | | | | | Fix merge errorGravatar Craig Tiller2016-03-30
| | | | | | * | | | | | | Merge github.com:grpc/grpc into accountingGravatar Craig Tiller2016-03-30
| | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | |
| | | | | | | | * | | | | Merge github.com:grpc/grpc into optionalize_roundrobinGravatar Craig Tiller2016-03-30
| | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #6020 from grpc/revert-5963-csharp_refactor_buildingGravatar Jan Tattermusch2016-03-30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | * \ \ \ \ Merge github.com:grpc/grpc into optionalize_roundrobinGravatar Craig Tiller2016-03-30
| | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #6022 from grpc/revert-5933-sockaddr_resolver_lbGravatar Jan Tattermusch2016-03-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Revert "added grpclb support to sockaddr resolver"Gravatar Craig Tiller2016-03-30
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #6014 from nicolasnoble/manual-upmergeGravatar Jan Tattermusch2016-03-30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ Merge github.com:grpc/grpc into accountingGravatar Craig Tiller2016-03-30
| | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | Revert "Refactor C# building in run_tests.py"Gravatar Jan Tattermusch2016-03-30
| |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5933 from dgquintas/sockaddr_resolver_lbGravatar Jan Tattermusch2016-03-30
|\ \ \ \ \ \ \ \ \ \ \ \ \