aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
...
* | | | | | | | | | | | | | | | | | | | | Merge pull request #11102 from ctiller/clang5Gravatar Craig Tiller2017-05-12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Reverted submodule changes...Gravatar Nicolas "Pixel" Noble2017-05-12
| | | | | | | | | | | | | * | | | | | | | | Merge github.com:grpc/grpc into serve_friesGravatar Craig Tiller2017-05-12
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | | Update Python interop tests to use google-auth packageGravatar Ken Payson2017-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
|/ / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | Fix portabilityGravatar Muxi Yan2017-05-11
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #11106 from dgquintas/fix_run_testsGravatar David G. Quintas2017-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #11030 from vjpai/ossGravatar Vijay Pai2017-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Fix run_tests for C++Gravatar David Garcia Quintas2017-05-11
| |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | Undo revert of protoGravatar Craig Tiller2017-05-11
| | * | | | | | | | | | | | | | | | | | | | | Propagate deadline to GenericServerContextGravatar yang-g2017-05-11
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #11075 from murgatroid99/node_expose_constantsGravatar Michael Lumish2017-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #11086 from matt-kwong/upload_macGravatar Matt Kwong2017-05-11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | * | | | | | format changes, address commentsGravatar Alexander Polcyn2017-05-11
| | | | * | | | | | | | | | | | | | | | | | | | just use char* overloadGravatar Craig Tiller2017-05-11
| | | | * | | | | | | | | | | | | | | | | | | | Explicitly mention std::stringGravatar Craig Tiller2017-05-11
| | | | * | | | | | | | | | | | | | | | | | | | Attempted fixGravatar Craig Tiller2017-05-11
| | | | | | | | | * | | | | | | | | | | | | | | Adding documentation for C++ unit testsGravatar Mahak Mukhi2017-05-11
| | | | | | | | | | | | | | | | * | | | | | | | Fixes to subchannel and its indexGravatar David Garcia Quintas2017-05-11
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | Merge branch 'bazel_docker' of github.com:matt-kwong/grpc into clang5Gravatar Craig Tiller2017-05-11
| |_|_|/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into importGravatar Nicolas "Pixel" Noble2017-05-11
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | | | Merge with master and fix a bad-mergeGravatar Sree Kuchibhotla2017-05-11
| | | | * | | | | | | | | | | | | | | | | | | Update Bazel Dockerfile to build from oss-fuzzGravatar Matt Kwong2017-05-11
| | | | | | | | * | | | | | | | | | | | | | | clangGravatar Sree Kuchibhotla2017-05-11
| | | | | | | | | | | | | | | | | | | | * | | C++ compatibility fixesGravatar Craig Tiller2017-05-11
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | | | | * | Blanket suppress protobuf from ubsan runsGravatar Craig Tiller2017-05-11
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | | | | | | | Merge branch 'master' into cq_mpsc_basedGravatar Sree Kuchibhotla2017-05-11
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpcGravatar Mahak Mukhi2017-05-11
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |