Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #11102 from ctiller/clang5 | 2017-05-12 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | * | | | | | | | | | | | | | | | | | | | Reverted submodule changes... | 2017-05-12 | ||
| | | | | | | | | | | | | * | | | | | | | | | Merge github.com:grpc/grpc into serve_fries | 2017-05-12 | ||
| | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-12 | ||
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | | | | | | | | | Update Python interop tests to use google-auth package | 2017-05-12 | ||
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #11104 from yang-g/generic_deadline_propagation | 2017-05-12 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #11056 from jtattermusch/csharp_protobuf_330 | 2017-05-12 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge failure, removed test still here. | 2017-05-12 | ||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge failure: mangled the examples BUILD file. | 2017-05-12 | ||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge failure, missing commas. | 2017-05-12 | ||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge failure - add new linkshared argument. | 2017-05-12 | ||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge failure - missing comma in deps list. | 2017-05-12 | ||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge failure - duplicated fake_resolver target. | 2017-05-12 | ||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge failure - forgot grpc_generate_one_off_targets | 2017-05-12 | ||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge failure - duplicated external_deps. | 2017-05-12 | ||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge failure - missing grpc_cc_binary. | 2017-05-12 | ||
| | | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-12 | ||
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | * | | | | | | | | | | | | | | | | | drop node 0.12 and 3 distribtests | 2017-05-12 | ||
| | | | | | | * | | | | | | | | | | | | | | | | | shorten name | 2017-05-12 | ||
| | | | | | | * | | | | | | | | | | | | | | | | | Run mac and windows distribtests in workspace | 2017-05-12 | ||
| | | | | | | * | | | | | | | | | | | | | | | | | regenerate | 2017-05-12 | ||
| | | | | | | * | | | | | | | | | | | | | | | | | make one Node artfact build exclusive | 2017-05-12 | ||
| | | | | | | * | | | | | | | | | | | | | | | | | adjust package build scripts to new paths | 2017-05-12 | ||
| | | | | | | * | | | | | | | | | | | | | | | | | simplify building artifacts on a single machine | 2017-05-12 | ||
| |_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||
| * | | | | | | | | | | | | | | | | | | | | | | upgrade C# to protobuf 3.3.0 | 2017-05-12 | ||
|/ / / / / / / / / / / / / / / / / / / / / / | ||||
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #11090 from jtattermusch/fix_protoc_build | 2017-05-12 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | | | | | | | | | | fix protoc x86 windows artifact build | 2017-05-12 | ||
|/ / / / / / / / / / / / / / / / / / / / / / | ||||
| | | * | | | | | | | | | | | | | | | | | | | Fix portability | 2017-05-11 | ||
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #11106 from dgquintas/fix_run_tests | 2017-05-11 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #11030 from vjpai/oss | 2017-05-11 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | | | | | | | | | | | | | | | | Fix run_tests for C++ | 2017-05-11 | ||
| |/ / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||
| | | * | | | | | | | | | | | | | | | | | | | | Undo revert of proto | 2017-05-11 | ||
| | * | | | | | | | | | | | | | | | | | | | | | Propagate deadline to GenericServerContext | 2017-05-11 | ||
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #11075 from murgatroid99/node_expose_constants | 2017-05-11 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
* \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #11086 from matt-kwong/upload_mac | 2017-05-11 | ||
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | | | * | | | | | | format changes, address comments | 2017-05-11 | ||
| | | | * | | | | | | | | | | | | | | | | | | | | just use char* overload | 2017-05-11 | ||
| | | | * | | | | | | | | | | | | | | | | | | | | Explicitly mention std::string | 2017-05-11 | ||
| | | | * | | | | | | | | | | | | | | | | | | | | Attempted fix | 2017-05-11 | ||
| | | | | | | | | * | | | | | | | | | | | | | | | Adding documentation for C++ unit tests | 2017-05-11 | ||
| | | | | | | | | | | | | | | | * | | | | | | | | Fixes to subchannel and its index | 2017-05-11 | ||
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch 'bazel_docker' of github.com:matt-kwong/grpc into clang5 | 2017-05-11 | ||
| |_|_|/| | | | | | | | | | | | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | * | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | 2017-05-11 | ||
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | * | | | | | | | | | | | | | | | Merge with master and fix a bad-merge | 2017-05-11 | ||
| | | | * | | | | | | | | | | | | | | | | | | | Update Bazel Dockerfile to build from oss-fuzz | 2017-05-11 | ||
| | | | | | | | * | | | | | | | | | | | | | | | clang | 2017-05-11 | ||
| | | | | | | | | | | | | | | | | | | | * | | | C++ compatibility fixes | 2017-05-11 | ||
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | | | | | | | | | | | | * | | Blanket suppress protobuf from ubsan runs | 2017-05-11 | ||
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | * | | | | | | | | | | | | | Merge branch 'master' into cq_mpsc_based | 2017-05-11 | ||
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||
| | | | | | | | | * | | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc | 2017-05-11 | ||
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |