Commit message (Expand) | Author | Age | |
---|---|---|---|
* | remove unncessary include | Yuxuan Li | 2017-05-15 |
* | fix last merge | Yuxuan Li | 2017-05-15 |
* | fix merge | Yuxuan Li | 2017-05-15 |
|\ | |||
* \ | merge master, resolve conflict | Yuxuan Li | 2017-05-15 |
|\ \ | |||
| * \ | Merge pull request #11133 from jtattermusch/internal_ci_artifact_builds | Jan Tattermusch | 2017-05-15 |
| |\ \ | |||
| * \ \ | Merge pull request #11137 from jtattermusch/internal_ci_move_docker_graph | Jan Tattermusch | 2017-05-15 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #11100 from MakMukhi/master | MakMukhi | 2017-05-15 |
| |\ \ \ \ | |||
| | | * | | | prevent out of disk space error | Jan Tattermusch | 2017-05-15 |
| * | | | | | Merge pull request #10662 from sreecha/cq_mpsc_based | Sree Kuchibhotla | 2017-05-15 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #11134 from ctiller/build-wtf | Craig Tiller | 2017-05-15 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | * | | | | | Fix a build bug, add a note | Craig Tiller | 2017-05-15 |
| | * | | | | | Really remove rule | Craig Tiller | 2017-05-15 |
| | * | | | | | Eliminate grpc_cc_libraries | Craig Tiller | 2017-05-15 |
| |/ / / / / | |||
| | | | * / | add artifact build jobs | Jan Tattermusch | 2017-05-15 |
| | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #11115 from jtattermusch/revamp_artifacts | Jan Tattermusch | 2017-05-15 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #11076 from dgquintas/epoll_error_static_string | David G. Quintas | 2017-05-12 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #10621 from nicolasnoble/import | Nicolas Noble | 2017-05-12 |
| |\ \ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-13 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #11121 from grpc/revert-10849-backward-compat | Craig Tiller | 2017-05-12 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | Revert "Implement Server Backward Compatibility" | Nicolas Noble | 2017-05-12 |
| |/ / / / / / / | |||
| | * | | | | | | Reverting protobuf submodule change. | Nicolas "Pixel" Noble | 2017-05-13 |
| | * | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-12 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #10849 from muxi/backward-compat | Muxi Yan | 2017-05-12 |
| |\ \ \ \ \ \ \ | |||
| | | * | | | | | | Fixing mock test target. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | * | | | | | | Broken merge: missed a few new libraries. | Nicolas "Pixel" Noble | 2017-05-12 |
| * | | | | | | | | Merge pull request #11102 from ctiller/clang5 | Craig Tiller | 2017-05-12 |
| |\ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | Reverted submodule changes... | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | * | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | |\ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #11104 from yang-g/generic_deadline_propagation | Yang Gao | 2017-05-12 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #11056 from jtattermusch/csharp_protobuf_330 | Jan Tattermusch | 2017-05-12 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | | | Merge failure, removed test still here. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | | | Merge failure: mangled the examples BUILD file. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | | | Merge failure, missing commas. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | | | Merge failure - add new linkshared argument. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | | | Merge failure - missing comma in deps list. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | | | Merge failure - duplicated fake_resolver target. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | | | Merge failure - forgot grpc_generate_one_off_targets | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | | | Merge failure - duplicated external_deps. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | | | Merge failure - missing grpc_cc_binary. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | |\ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |||
| | | | | | | | * | | | | drop node 0.12 and 3 distribtests | Jan Tattermusch | 2017-05-12 |
| | | | | | | | * | | | | shorten name | Jan Tattermusch | 2017-05-12 |
| | | | | | | | * | | | | Run mac and windows distribtests in workspace | Jan Tattermusch | 2017-05-12 |
| | | | | | | | * | | | | regenerate | Jan Tattermusch | 2017-05-12 |
| | | | | | | | * | | | | make one Node artfact build exclusive | Jan Tattermusch | 2017-05-12 |
| | | | | | | | * | | | | adjust package build scripts to new paths | Jan Tattermusch | 2017-05-12 |
| | | | | | | | * | | | | simplify building artifacts on a single machine | Jan Tattermusch | 2017-05-12 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | upgrade C# to protobuf 3.3.0 | Jan Tattermusch | 2017-05-12 |
| |/ / / / / / / / / | |||
| * | | | | | | | | | Merge pull request #11090 from jtattermusch/fix_protoc_build | Jan Tattermusch | 2017-05-12 |
| |\ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | fix protoc x86 windows artifact build | Jan Tattermusch | 2017-05-12 |
| |/ / / / / / / / / |