Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #7771 from y-zeng/cares_buildin | Yuchen Zeng | 2017-03-24 |
|\ | | | | | Async DNS resolver with pre-configured c-ares | ||
* \ | Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 | Nicolas "Pixel" Noble | 2017-03-24 |
|\ \ | |||
| | * | 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 |
| | |\ \ | |||
| * | \ \ | Merge pull request #10157 from muxi/advance-protoc-version | Muxi Yan | 2017-03-17 |
| |\ \ \ \ | | | | | | | | | | | | | Advance ProtoCompiler version and fix podspecs | ||
* | | | | | | add hyper to Dockerfile.template | Eric Gribkoff | 2017-03-17 |
| | | | | | | |||
| | * | | | | Changes to podspecs | Muxi Yan | 2017-03-16 |
| | | | | | | |||
| | * | | | | Relieve ios deployment version to 7.0 | Muxi Yan | 2017-03-16 |
| | | | | | | |||
| * | | | | | Drop support for io.js, fix minor issue with node extension | murgatroid99 | 2017-03-14 |
| |/ / / / | |||
| * | | | | Merge remote-tracking branch 'upstream/v1.2.x' into node_uv_default | murgatroid99 | 2017-03-10 |
| |\ \ \ \ | |||
| * | | | | | Switch Node back to using libuv iomgr by default | murgatroid99 | 2017-03-09 |
| | | | | | | |||
* | | | | | | Add newest dotnet SDK to C# dockerfile | Jan Tattermusch | 2017-03-09 |
| |/ / / / |/| | | | | |||
* | | | | | Merge pull request #10033 from matt-kwong/fix-dockerfiles | matt-kwong | 2017-03-08 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix pyenv Dockerfile | ||
| * | | | | Fix pyenv dockerfile | Matt Kwong | 2017-03-08 |
| | | | | | |||
* | | | | | Merge pull request #10026 from mehrdada/bump-proto-depenedency-on-python-3.2 | Mehrdad Afshari | 2017-03-07 |
|\ \ \ \ \ | |/ / / / |/| | | | | Updated protobuf dependency for python to 3.2.0 | ||
* | | | | | Merge pull request #10004 from dgquintas/1.1.x_to_master_again | David G. Quintas | 2017-03-07 |
|\ \ \ \ \ | | | | | | | | | | | | | 1.1.x to master again | ||
| | * | | | | Updated protobuf dependency for python to 3.2.0 | Mehrdad Afshari | 2017-03-07 |
| |/ / / / |/| | | | | |||
* | | | | | fix bazel_deps.sh | Jan Tattermusch | 2017-03-07 |
| | | | | | |||
* | | | | | update C# project.json dependencies | Jan Tattermusch | 2017-03-07 |
| | | | | | |||
* | | | | | updgrade C# project.json to protobuf 3.2.0 | Jan Tattermusch | 2017-03-07 |
| | | | | | |||
| * | | | | Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_master_again | David Garcia Quintas | 2017-03-06 |
|/| | | | | |||
| * | | | | Merge pull request #9962 from murgatroid99/node_no_alpn_compile | Michael Lumish | 2017-03-06 |
| |\ \ \ \ | | | | | | | | | | | | | Add option to recompile Node library without ALPN support | ||
| * | | | | | fix Grpc.HealthCheck and Grpc.Reflection packages | Jan Tattermusch | 2017-03-03 |
| | | | | | | |||
| | * | | | | Add option to recompile Node library without ALPN support | murgatroid99 | 2017-03-02 |
| |/ / / / | |||
* | | | | | Merge pull request #9769 from ctiller/always-use-port-server | Craig Tiller | 2017-03-01 |
|\ \ \ \ \ | | | | | | | | | | | | | Always use port server | ||
* | | | | | | PHP: prepare for 1.2 release | Stanley Cheung | 2017-03-01 |
| | | | | | | |||
* | | | | | | Merge pull request #9888 from murgatroid99/electron_uv_fix | Michael Lumish | 2017-03-01 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | Fix missing wakeups when using the libuv iomgr under Electron | ||
| | | * | | | Relieve ios deployment version to 7.0 | Muxi Yan | 2017-02-28 |
| | | | | | | |||
| | * | | | | Update template | Craig Tiller | 2017-02-28 |
| |/ / / / |/| | | | | |||
| * | | | | Fix missing wakeups when using the libuv iomgr under Electron | murgatroid99 | 2017-02-27 |
| |/ / / | |||
* | | | | Merge pull request #9857 from murgatroid99/merge_1.1.x_master | Michael Lumish | 2017-02-27 |
|\ \ \ \ | | | | | | | | | | | Upmerge 1.1.x into master | ||
* \ \ \ \ | Merge pull request #9747 from ctiller/splitsies | Craig Tiller | 2017-02-24 |
|\ \ \ \ \ | | | | | | | | | | | | | Increase timeout for bm_fullstack | ||
| | * | | | | Merge remote-tracking branch 'upstream/v1.1.x' into merge_1.1.x_master | murgatroid99 | 2017-02-23 |
| |/| | | | |/| |/ / / | |||
* | | | | | Merge pull request #9694 from nicolasnoble/upmerge_from_1_1_x | Michael Lumish | 2017-02-23 |
|\ \ \ \ \ | | | | | | | | | | | | | Upmerge from 1.1.x | ||
| | | * \ \ | Merge pull request #9766 from murgatroid99/node_uv_testing | Michael Lumish | 2017-02-22 |
| | | |\ \ \ | | | | | | | | | | | | | | | Improve Node and libuv testing and test coverage | ||
| | * | | | | | Exclude poll, poll-cv for bm_fullstack (its not interesting) | Craig Tiller | 2017-02-22 |
| | | | | | | | |||
| | | | * | | | Improve Node and libuv testing and test coverage | murgatroid99 | 2017-02-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow Node tests to run with or without UV, change default version to 7, add some portability tests. Also make some more core tests work with libuv | ||
| | * | | | | | Increase timeout for bm_fullstack | Craig Tiller | 2017-02-16 |
| |/ / / / / |/| | | | | | |||
* | | | | | | Merge remote-tracking branch 'upstream/master' into packet-coalescing-core | Muxi Yan | 2017-02-14 |
|\ \ \ \ \ \ | |||
| | * | | | | | Merge remote-tracking branch 'google/v1.1.x' | Nicolas "Pixel" Noble | 2017-02-13 |
| |/| | | | | | | |/ / / / | |||
| * | | | | | Merge pull request #9665 from jtattermusch/cmake_csharp_extension | Jan Tattermusch | 2017-02-10 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Use grpc_csharp_ext built by cmake | ||
| * | | | | | Merge pull request #9599 from ppietrasa/feature-PDBs | Jan Tattermusch | 2017-02-10 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix issue #9597 | ||
| | | * | | | | use grpc_csharp_ext built by cmake | Jan Tattermusch | 2017-02-09 |
| | |/ / / / | |/| | | | | |||
| * | | | | | Advance protoc podspec template version to 3.1.0 as well | Muxi Yan | 2017-02-09 |
| | | | | | | |||
| | | * | | | build fixes for ruby on mac | Alexander Polcyn | 2017-02-09 |
| | | |/ / | |||
| | * | | | Cosmetics (removed one newline) | Piotr Pietraszkiewicz | 2017-02-09 |
| | | | | |