Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4 | murgatroid99 | 2017-04-13 |
|\ | |||
* | | Fix BUILD dependency, copyright and cmake | yang-g | 2017-04-12 |
| | | |||
| * | Merge pull request #10303 from murgatroid99/makefile_soname_fix | Michael Lumish | 2017-04-12 |
| |\ | | | | | | | Fix soname version mismatch in Makefile | ||
* | \ | Merge pull request #10556 from murgatroid99/node_windows_warning_fix | Michael Lumish | 2017-04-11 |
|\ \ \ | | | | | | | | | Fix Windows warning in binding.gyp for Win10 console | ||
* \ \ \ | Merge pull request #10480 from jtattermusch/csharp_new_projects | Jan Tattermusch | 2017-04-11 |
|\ \ \ \ | | | | | | | | | | | C# new .csproj projects | ||
* \ \ \ \ | Merge pull request #10551 from matt-kwong/fix-csharp-docker | Matt Kwong | 2017-04-10 |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unnecessary C# dependency in Dockerfiles | ||
* \ \ \ \ \ | Merge pull request #10407 from kpayson64/alpine_linux_support | kpayson64 | 2017-04-10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Alpine linux support | ||
| | | | * | | | Node: fix Windows warning in binding.gyp for Win10 console | murgatroid99 | 2017-04-10 |
| |_|_|/ / / |/| | | | | | |||
| | * | | | | Fix C# Dockerfiles | Matt Kwong | 2017-04-10 |
| |/ / / / |/| | | | | |||
* | | | | | allow using gRPC as a cmake subproject | Jan Tattermusch | 2017-04-07 |
| | | | | | |||
| | | * | | make C# docker image in sync with GCE performance workers | Jan Tattermusch | 2017-04-07 |
| | | | | | |||
| | | * | | Add newest dotnet SDK to C# dockerfile | Jan Tattermusch | 2017-04-07 |
| | | | | | |||
| | * | | | fix C# build_packages scripts | Jan Tattermusch | 2017-04-07 |
| | | | | | |||
| | * | | | adjust run_tests scripts | Jan Tattermusch | 2017-04-07 |
| | | | | | |||
| | * | | | Initial migration to new .csproj files | Jan Tattermusch | 2017-04-07 |
| |/ / / |/| | | | |||
* | | | | Merge pull request #10500 from jtattermusch/upmerge_v12x | Jan Tattermusch | 2017-04-07 |
|\ \ \ \ | | | | | | | | | | | Upmerge from upstream/v1.2.x to master | ||
| | * | | | Fix build on Alpine linux + add portability tests | Ken Payson | 2017-04-06 |
| |/ / / |/| | | | |||
* | | | | Merge pull request #10204 from murgatroid99/node_protobuf_js_6_upgrade | Michael Lumish | 2017-04-06 |
|\ \ \ \ | | | | | | | | | | | Upgrade Node dependency on Protobuf.js to version 6 | ||
| | * | | | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_v12x | Jan Tattermusch | 2017-04-06 |
| | |\| | | |||
* | | | | | make C# docker image in sync with GCE performance workers | Jan Tattermusch | 2017-04-06 |
| |/ / / |/| | | | |||
| | * | | backport #10100 and #10377 | Eric Gribkoff | 2017-04-05 |
| | | | | |||
| * | | | Merge branch 'master' into node_protobuf_js_6_upgrade | murgatroid99 | 2017-04-04 |
| |\ \ \ | |/ / / |/| | | | |||
| * | | | Fix serializer error handling, update ProtoBuf.js dependency | murgatroid99 | 2017-04-03 |
| | | | | |||
* | | | | Merge branch 'master' into node_dbg_release_split | Michael Lumish | 2017-04-03 |
|\ \ \ \ | |||
| | * \ \ | Merge branch 'master' into node_protobuf_js_6_upgrade | Michael Lumish | 2017-04-03 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | update go version in Dockerfile to 1.8 | Menghan Li | 2017-03-31 |
| | | | | | |||
| * | | | | Fix test coverage reporting | Matt Kwong | 2017-03-31 |
| | | | | | |||
| * | | | | Merge pull request #9780 from ctiller/cpp_bazelness | Nicolas Noble | 2017-03-30 |
| |\ \ \ \ | | | | | | | | | | | | | More C++ Bazel support | ||
| * | | | | | update dockerfile to version 2.6.1 of h2 | Eric Gribkoff | 2017-03-29 |
| | | | | | | |||
| * | | | | | Merge pull request #10361 from nicolasnoble/cares-fixup | Nicolas Noble | 2017-03-29 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixing embedded build of cares for certain targets. | ||
| | * | | | | | Fixing embedded build of cares for certain targets. | Nicolas "Pixel" Noble | 2017-03-29 |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' of https://github.com/grpc/grpc into cpp_bazelness | Nicolas "Pixel" Noble | 2017-03-29 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #10309 from menghanl/go_version | Noah Eisen | 2017-03-29 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | update go version in Dockerfile to latest | ||
| | | | | * | | Merge pull request #10019 from twk3/fix-gem-build | apolcyn | 2017-03-27 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | Fix for using gem build/install | ||
| | | * | | \ \ | Merge branch 'master' of https://github.com/grpc/grpc into cpp_bazelness | Nicolas "Pixel" Noble | 2017-03-27 |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #7771 from y-zeng/cares_buildin | Yuchen Zeng | 2017-03-24 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Async DNS resolver with pre-configured c-ares | ||
| | | * | | | | | | update go version in Dockerfile to 1.8 | Menghan Li | 2017-03-24 |
| | |/ / / / / / | |/| | | | | | | |||
| | | | * | | | | Merge branch 'master' into node_protobuf_js_6_upgrade | Michael Lumish | 2017-03-24 |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||
| | | | | | | * | Fix soname version mismatch in Makefile | murgatroid99 | 2017-03-24 |
| | | | | | |/ | | | | | |/| | |||
* | | | | | | | Node: explicitly define Release and Debug builds, use build flags from ↵ | murgatroid99 | 2017-03-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | build.yaml | ||
| * | | | | | | Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 | Nicolas "Pixel" Noble | 2017-03-24 |
|/| | | | | | | | |_|_|/ / | |/| | | | | |||
| | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into cpp_bazelness | Nicolas "Pixel" Noble | 2017-03-22 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
| | * | | | | Add CARES_BUILD_INCLUDE_DIR | Yuchen Zeng | 2017-03-21 |
| | | | | | | |||
| | * | | | | Fix cmake build on linux | Yuchen Zeng | 2017-03-20 |
| | | | | | | |||
| | * | | | | Fix uv, cmake, bazel build | Yuchen Zeng | 2017-03-20 |
| | | | | | | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | Yuchen Zeng | 2017-03-17 |
| | |\ \ \ \ | |_|/ / / / |/| | | | | | |||
| | * | | | | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | Yuchen Zeng | 2017-03-17 |
| | |\ \ \ \ | |||
| | * \ \ \ \ | Merge remote-tracking branch 'upstream/master' into cares_bazel_rule | Yuchen Zeng | 2017-03-17 |
| | |\ \ \ \ \ | |||
| | | | | | * | | Upgrade Node dependency on Protobuf.js to version 6 | murgatroid99 | 2017-03-17 |
| | | | | | | | | |||
| * | | | | | | | Merge pull request #10157 from muxi/advance-protoc-version | Muxi Yan | 2017-03-17 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Advance ProtoCompiler version and fix podspecs |