Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Revert "Merge branch 'master' into v1.3.x" | 2017-04-26 | |
| | | | | | This reverts commit 79759fea1abd09102d38af3e13a84b69e898124b, reversing changes made to dc36f4df6aba60275a31227e1d29c4d20b6cadca. | ||
* | Merge branch 'master' into v1.3.x | 2017-04-25 | |
|\ | |||
| * | Merge pull request #10644 from MakMukhi/master | 2017-04-24 | |
| |\ | | | | | | | Added unit testing support. | ||
| * | | Increase portability of CMakeLists.txt | 2017-04-20 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update CMakeLists.txt (original template and generated code) to prevent forcefully linking `dl` on all UNIX platforms, and rely on `${CMAKE_DL_LIBS}` portable variable instead. - Do not try linking against `librt` on macOS. - Add a `config_freebsd` directory containing the header file generated by the `configure` script for the `ares` library. | ||
* | | | Merge pull request #10737 from murgatroid99/node_artifact_alpine_compatibility | 2017-04-20 | |
|\ \ \ | | | | | | | | | Add flag to compile gpr with compatibility for musl | ||
| | * \ | Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.x | 2017-04-19 | |
| | |\ \ | |||
* | | | | | Node: fix the cases where zlib is built | 2017-04-19 | |
| | | | | | |||
* | | | | | Node: Don't depend on cares npm package | 2017-04-19 | |
| |_|/ / |/| | | | |||
| * | | | Add flag to compile gpr with compatibility for musl | 2017-04-19 | |
|/ / / | |||
| | * | Tab/space problem with Makefile.template | 2017-04-18 | |
| | | | |||
| | * | Readding the line mistakenly deleted. | 2017-04-18 | |
| | | | |||
| | * | trial and error | 2017-04-18 | |
| | | | |||
| | * | discovered generate_projects.sh script! | 2017-04-18 | |
| | | | |||
| * | | Keep _grpcio_metadata.py in GitHub repo | 2017-04-18 | |
| | | | |||
* | | | Merge pull request #10669 from stanley-cheung/php-add-ares-deps | 2017-04-18 | |
|\ \ \ | | | | | | | | | PHP: add ares as deps | ||
| * | | | PHP: add ares as deps | 2017-04-14 | |
| |/ / | |||
* / / | Build for more versions of electron, restrict when a Windows warning is shown | 2017-04-13 | |
|/ / | |||
* | | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4 | 2017-04-13 | |
|\ \ | |/ |/| | |||
* | | Fix BUILD dependency, copyright and cmake | 2017-04-12 | |
| | | |||
| * | Merge pull request #10303 from murgatroid99/makefile_soname_fix | 2017-04-12 | |
| |\ | | | | | | | Fix soname version mismatch in Makefile | ||
* | \ | Merge pull request #10556 from murgatroid99/node_windows_warning_fix | 2017-04-11 | |
|\ \ \ | | | | | | | | | Fix Windows warning in binding.gyp for Win10 console | ||
* \ \ \ | Merge pull request #10480 from jtattermusch/csharp_new_projects | 2017-04-11 | |
|\ \ \ \ | | | | | | | | | | | C# new .csproj projects | ||
* \ \ \ \ | Merge pull request #10551 from matt-kwong/fix-csharp-docker | 2017-04-10 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unnecessary C# dependency in Dockerfiles | ||
* \ \ \ \ \ | Merge pull request #10407 from kpayson64/alpine_linux_support | 2017-04-10 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Alpine linux support | ||
| | | | * | | | Node: fix Windows warning in binding.gyp for Win10 console | 2017-04-10 | |
| |_|_|/ / / |/| | | | | | |||
| | * | | | | Fix C# Dockerfiles | 2017-04-10 | |
| |/ / / / |/| | | | | |||
* | | | | | allow using gRPC as a cmake subproject | 2017-04-07 | |
| | | | | | |||
| | | * | | make C# docker image in sync with GCE performance workers | 2017-04-07 | |
| | | | | | |||
| | | * | | Add newest dotnet SDK to C# dockerfile | 2017-04-07 | |
| | | | | | |||
| | * | | | fix C# build_packages scripts | 2017-04-07 | |
| | | | | | |||
| | * | | | adjust run_tests scripts | 2017-04-07 | |
| | | | | | |||
| | * | | | Initial migration to new .csproj files | 2017-04-07 | |
| |/ / / |/| | | | |||
* | | | | Merge pull request #10500 from jtattermusch/upmerge_v12x | 2017-04-07 | |
|\ \ \ \ | | | | | | | | | | | Upmerge from upstream/v1.2.x to master | ||
| | * | | | Fix build on Alpine linux + add portability tests | 2017-04-06 | |
| |/ / / |/| | | | |||
* | | | | Merge pull request #10204 from murgatroid99/node_protobuf_js_6_upgrade | 2017-04-06 | |
|\ \ \ \ | | | | | | | | | | | Upgrade Node dependency on Protobuf.js to version 6 | ||
| | * | | | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_v12x | 2017-04-06 | |
| | |\| | | |||
* | | | | | make C# docker image in sync with GCE performance workers | 2017-04-06 | |
| |/ / / |/| | | | |||
| | * | | backport #10100 and #10377 | 2017-04-05 | |
| | | | | |||
| * | | | Merge branch 'master' into node_protobuf_js_6_upgrade | 2017-04-04 | |
| |\ \ \ | |/ / / |/| | | | |||
| * | | | Fix serializer error handling, update ProtoBuf.js dependency | 2017-04-03 | |
| | | | | |||
* | | | | Merge branch 'master' into node_dbg_release_split | 2017-04-03 | |
|\ \ \ \ | |||
| | * \ \ | Merge branch 'master' into node_protobuf_js_6_upgrade | 2017-04-03 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | * | | update go version in Dockerfile to 1.8 | 2017-03-31 | |
| | | | | | |||
| * | | | | Fix test coverage reporting | 2017-03-31 | |
| | | | | | |||
| * | | | | Merge pull request #9780 from ctiller/cpp_bazelness | 2017-03-30 | |
| |\ \ \ \ | | | | | | | | | | | | | More C++ Bazel support | ||
| * | | | | | update dockerfile to version 2.6.1 of h2 | 2017-03-29 | |
| | | | | | | |||
| * | | | | | Merge pull request #10361 from nicolasnoble/cares-fixup | 2017-03-29 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixing embedded build of cares for certain targets. | ||
| | * | | | | | Fixing embedded build of cares for certain targets. | 2017-03-29 | |
| | | | | | | | |||
| | | * | | | | Merge branch 'master' of https://github.com/grpc/grpc into cpp_bazelness | 2017-03-29 | |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #10309 from menghanl/go_version | 2017-03-29 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | update go version in Dockerfile to latest |