Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #5700 from bluecmd/ssl-defaults | 2016-03-31 | |
|\ | |||
* \ | Merge pull request #6041 from vjpai/i_know_virtual_destructors | 2016-03-31 | |
|\ \ | |||
* \ \ | Merge pull request #6034 from dgquintas/uri_query_parts | 2016-03-31 | |
|\ \ \ | |||
* \ \ \ | Merge pull request #5955 from jtattermusch/clearer_onconnect_msg | 2016-03-31 | |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #6039 from ctiller/copyright-fix | 2016-03-31 | |
|\ \ \ \ \ | |||
| * \ \ \ \ | Merge github.com:grpc/grpc into copyright-fix | 2016-03-31 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | |||
| | | | * | | Merge branch 'master' into i_know_virtual_destructors | 2016-03-31 | |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | |||
| | | | * | | Add virtual destructor to satisfy a requirement of some compilers | 2016-03-31 | |
* | | | | | | Merge pull request #5943 from vjpai/make_unix_sockets_great_again | 2016-03-31 | |
|\ \ \ \ \ \ | |||
| | | | * \ \ | Merge branch 'master' of github.com:grpc/grpc into uri_query_parts | 2016-03-31 | |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | |||
| | | | * | | | Added grpc_uri_get_query_arg per comments. | 2016-03-31 | |
* | | | | | | | Merge pull request #6000 from ctiller/optionalize_roundrobin | 2016-03-31 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into copyright-fix | 2016-03-31 | |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | |||
| | | * | | | | Update copyrights | 2016-03-31 | |
| | | * | | | | Update tool | 2016-03-31 | |
| | | | | * | | Added & and = to URI queries | 2016-03-30 | |
* | | | | | | | Merge pull request #6030 from nicolasnoble/upmerge | 2016-03-30 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||
| * | | | | | | Merge branch 'release-0_13' into upmerge | 2016-03-31 | |
|/| | | | | | | |||
| * | | | | | | Merge pull request #6031 from nicolasnoble/0.13.2-pre1 | 2016-03-30 | |
| |\ \ \ \ \ \ | |||
* | \ \ \ \ \ \ | Merge pull request #5691 from ctiller/idempotent | 2016-03-30 | |
|\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | The release-0_13 branch is now 0.13.2-pre1. | 2016-03-31 | |
| | |/ / / / / / | |||
* | | | | | | | | Merge pull request #5699 from ctiller/accounting | 2016-03-30 | |
|\ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ | Merge pull request #5764 from ctiller/internal-canary | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge pull request #6026 from nicolasnoble/flagging-0.13.1 | 2016-03-30 | |
| | | | |\ \ \ \ \ \ | |||
* | | | | \ \ \ \ \ \ | Merge pull request #5984 from jtattermusch/perf_tests_script | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6021 from grpc/release-0_13 | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | |||
* | | | | | | | | | | | | Merge pull request #5894 from soltanmm/stop-that | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6025 from jtattermusch/csharp_refactor_building_take2 | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * \ \ \ \ | Merge branch 'master' into optionalize_roundrobin | 2016-03-30 | |
| | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | dont break mac build by EMBED_ZLIB=true again | 2016-03-30 | |
| * | | | | | | | | | | | | | make C# mac build use same args as in artifact builder | 2016-03-30 | |
| | | | | | | | * | | | | | | Flagging the 0.13.1 release. | 2016-03-30 | |
| | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | | | |||
* | | | | | | | | | | | | | Merge pull request #5966 from jtattermusch/interop_worker_script | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Add a comment. | 2016-03-30 | |
| | * | | | | | | | | | | | | dont break the mac build | 2016-03-30 | |
| | * | | | | | | | | | | | | disable C# arch choosing for now | 2016-03-30 | |
| | * | | | | | | | | | | | | refactor C# building | 2016-03-30 | |
| | * | | | | | | | | | | | | polish some .bat files | 2016-03-30 | |
| | * | | | | | | | | | | | | always embed zlib and openssl for C# | 2016-03-30 | |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||
| | | | | | * | | | | | | | Fix merge error | 2016-03-30 | |
| | | | | | * | | | | | | | Merge github.com:grpc/grpc into accounting | 2016-03-30 | |
| | | | | | |\ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |||
| | | | | | | | * | | | | | Merge github.com:grpc/grpc into optionalize_roundrobin | 2016-03-30 | |
| | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge pull request #6020 from grpc/revert-5963-csharp_refactor_building | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | * \ \ \ \ | Merge github.com:grpc/grpc into optionalize_roundrobin | 2016-03-30 | |
| | | | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Merge pull request #6022 from grpc/revert-5933-sockaddr_resolver_lb | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Revert "added grpclb support to sockaddr resolver" | 2016-03-30 | |
|/ / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | Merge pull request #6014 from nicolasnoble/manual-upmerge | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * \ \ \ \ \ | Merge github.com:grpc/grpc into accounting | 2016-03-30 | |
| | | | | | | | |\ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Revert "Refactor C# building in run_tests.py" | 2016-03-30 | |
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | Merge pull request #5933 from dgquintas/sockaddr_resolver_lb | 2016-03-30 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |