aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* remove unncessary includeGravatar Yuxuan Li2017-05-15
* fix last mergeGravatar Yuxuan Li2017-05-15
* fix mergeGravatar Yuxuan Li2017-05-15
|\
* \ merge master, resolve conflictGravatar Yuxuan Li2017-05-15
|\ \
| * \ Merge pull request #11133 from jtattermusch/internal_ci_artifact_buildsGravatar Jan Tattermusch2017-05-15
| |\ \
| * \ \ Merge pull request #11137 from jtattermusch/internal_ci_move_docker_graphGravatar Jan Tattermusch2017-05-15
| |\ \ \
| * \ \ \ Merge pull request #11100 from MakMukhi/masterGravatar MakMukhi2017-05-15
| |\ \ \ \
| | | * | | prevent out of disk space errorGravatar Jan Tattermusch2017-05-15
| * | | | | Merge pull request #10662 from sreecha/cq_mpsc_basedGravatar Sree Kuchibhotla2017-05-15
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #11134 from ctiller/build-wtfGravatar Craig Tiller2017-05-15
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | Fix a build bug, add a noteGravatar Craig Tiller2017-05-15
| | * | | | | Really remove ruleGravatar Craig Tiller2017-05-15
| | * | | | | Eliminate grpc_cc_librariesGravatar Craig Tiller2017-05-15
| |/ / / / /
| | | | * / add artifact build jobsGravatar Jan Tattermusch2017-05-15
| | |_|/ / | |/| | |
| * | | | Merge pull request #11115 from jtattermusch/revamp_artifactsGravatar Jan Tattermusch2017-05-15
| |\ \ \ \
| * \ \ \ \ Merge pull request #11076 from dgquintas/epoll_error_static_stringGravatar David G. Quintas2017-05-12
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #10621 from nicolasnoble/importGravatar Nicolas Noble2017-05-12
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-13
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #11121 from grpc/revert-10849-backward-compatGravatar Craig Tiller2017-05-12
| |\ \ \ \ \ \ \
| | * | | | | | | Revert "Implement Server Backward Compatibility"Gravatar Nicolas Noble2017-05-12
| |/ / / / / / /
| | * | | | | | Reverting protobuf submodule change.Gravatar Nicolas "Pixel" Noble2017-05-13
| | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-12
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #10849 from muxi/backward-compatGravatar Muxi Yan2017-05-12
| |\ \ \ \ \ \ \
| | | * | | | | | Fixing mock test target.Gravatar Nicolas "Pixel" Noble2017-05-12
| | | * | | | | | Broken merge: missed a few new libraries.Gravatar Nicolas "Pixel" Noble2017-05-12
| * | | | | | | | Merge pull request #11102 from ctiller/clang5Gravatar Craig Tiller2017-05-12
| |\ \ \ \ \ \ \ \
| | | | * | | | | | Reverted submodule changes...Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-12
| | | | |\ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #11104 from yang-g/generic_deadline_propagationGravatar Yang Gao2017-05-12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #11056 from jtattermusch/csharp_protobuf_330Gravatar Jan Tattermusch2017-05-12
| |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | Merge failure, removed test still here.Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | * | | | | | Merge failure: mangled the examples BUILD file.Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | * | | | | | Merge failure, missing commas.Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | * | | | | | Merge failure - add new linkshared argument.Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | * | | | | | Merge failure - missing comma in deps list.Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | * | | | | | Merge failure - duplicated fake_resolver target.Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | * | | | | | Merge failure - forgot grpc_generate_one_off_targetsGravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | * | | | | | Merge failure - duplicated external_deps.Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | * | | | | | Merge failure - missing grpc_cc_binary.Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | |\ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | | | | | | | * | | | drop node 0.12 and 3 distribtestsGravatar Jan Tattermusch2017-05-12
| | | | | | | | * | | | shorten nameGravatar Jan Tattermusch2017-05-12
| | | | | | | | * | | | Run mac and windows distribtests in workspaceGravatar Jan Tattermusch2017-05-12
| | | | | | | | * | | | regenerateGravatar Jan Tattermusch2017-05-12
| | | | | | | | * | | | make one Node artfact build exclusiveGravatar Jan Tattermusch2017-05-12
| | | | | | | | * | | | adjust package build scripts to new pathsGravatar Jan Tattermusch2017-05-12
| | | | | | | | * | | | simplify building artifacts on a single machineGravatar Jan Tattermusch2017-05-12
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| | * | | | | | | | | upgrade C# to protobuf 3.3.0Gravatar Jan Tattermusch2017-05-12
| |/ / / / / / / / /
| * | | | | | | | | Merge pull request #11090 from jtattermusch/fix_protoc_buildGravatar Jan Tattermusch2017-05-12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | fix protoc x86 windows artifact buildGravatar Jan Tattermusch2017-05-12
| |/ / / / / / / / /