Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into cares_buildin | Yuchen Zeng | 2016-08-24 |
|\ | |||
| * | Merge pull request #7802 from nicolasnoble/upmerge-from-v1.0.x | Nicolas Noble | 2016-08-23 |
| |\ | | | | | | | Upmerge from v1.0.x | ||
| * \ | Merge pull request #7819 from stanley-cheung/php-update-composer | Stanley Cheung | 2016-08-23 |
| |\ \ | | | | | | | | | PHP: bump version (master) | ||
| * \ \ | Merge pull request #7763 from thunderboltsid/add-pypy-to-dockerfile | kpayson64 | 2016-08-22 |
| |\ \ \ | | | | | | | | | | | Add PyPy 5.3.1 to dockerfile and template | ||
* | | | | | Use cares package in node | Yuchen Zeng | 2016-08-22 |
| | | | | | |||
| | | * | | php: bump version | Stanley Cheung | 2016-08-22 |
| | |/ / | |/| | | |||
| | | * | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
| | |/| | |/| | | |||
* | | | | Try to fix node interop issues | Yuchen Zeng | 2016-08-19 |
| | | | | |||
* | | | | Remove dependency on node c-ares | Yuchen Zeng | 2016-08-19 |
| | | | | |||
| * | | | Merge pull request #7762 from KindDragon/master | Nicolas Noble | 2016-08-18 |
| |\ \ \ | | | | | | | | | | | Fix CMake for windows (VS2015) | ||
* | | | | | Fix build with system c-ares | Yuchen Zeng | 2016-08-18 |
| | | | | | |||
| | | | * | Move Podspecs to v1 | Jorge Canizales | 2016-08-18 |
| | | | | | |||
| | * | | | Fix CMake for Windows | Arkadiy Shapkin | 2016-08-18 |
| | | | | | |||
* | | | | | Fix missing header | Yuchen Zeng | 2016-08-17 |
| | | | | | |||
* | | | | | Merge c-ares into libgrpc.a | Yuchen Zeng | 2016-08-17 |
| | | | | | |||
| | | * | | Add PyPy 5.3.1 to dockerfile and template | siddharthshukla | 2016-08-17 |
| | |/ / | |||
* | | | | Fix node on windows | Yuchen Zeng | 2016-08-16 |
| | | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into cares | Yuchen Zeng | 2016-08-16 |
|\ \ \ \ | | |/ / | |/| | | |||
| | | * | Update required protobuf version to v3.0.0 | Yuchen Zeng | 2016-08-15 |
| | | | | |||
| | * | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-16 |
| |/| | | | |/ | |||
* | | | Fix sed failure on mac | Yuchen Zeng | 2016-08-15 |
| | | | |||
| | * | use CommandLineParser with CoreCLR support | Jan Tattermusch | 2016-08-13 |
| | | | |||
| | * | Merge pull request #7660 from jtattermusch/google_apis_auth_coreclr | Jan Tattermusch | 2016-08-13 |
| | |\ | | | | | | | | | Updgrade Google.Apis.Auth dependency to 0.15 | ||
* | | | | Try to fix clang3.6+ build | Yuchen Zeng | 2016-08-12 |
| | | | | |||
* | | | | Add walkaround for github.com/c-ares/c-ares/issues/44 | Yuchen Zeng | 2016-08-12 |
| | | | | |||
| | * | | Merge pull request #7696 from murgatroid99/makefile_remove_proto_warning | Nicolas Noble | 2016-08-12 |
| | |\ \ | | | | | | | | | | | Remove warning about protobuf 3.0.0+ from the Makefile | ||
* | | | | | Fix ruby build | Yuchen Zeng | 2016-08-12 |
| | | | | | |||
* | | | | | Build c-ares without running ./configure | Yuchen Zeng | 2016-08-11 |
| | | | | | |||
| | * | | | Updating build package C# scripts. | Nicolas "Pixel" Noble | 2016-08-12 |
| | | | | | |||
| | * | | | Merge pull request #7682 from apolcyn/add_runtime_nodes_back_in_ga | Nicolas Noble | 2016-08-11 |
| | |\ \ \ | | | | | | | | | | | | | add all runtime nodes back into testing packages | ||
| | * \ \ \ | Merge pull request #7578 from murgatroid99/ruby_dependency_update_proto_3 | Nicolas Noble | 2016-08-11 |
| | |\ \ \ \ | | | | | | | | | | | | | | | Update ruby google-protobuf dependency to 3.0 | ||
| | * \ \ \ \ | Merge pull request #7577 from murgatroid99/node_dependency_update | Nicolas Noble | 2016-08-11 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Update node protobuf dependency to 3.0.0 where applicable. Also update example dependency to grpc 1.0.0 | ||
| * | \ \ \ \ \ | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-11 |
| |\ \ \ \ \ \ \ | |||
| | | | | | | | * | upgrade Google.Apis.Auth dependency to 0.15.0 | Jan Tattermusch | 2016-08-11 |
| | | |_|_|_|_|/ | | |/| | | | | | |||
* | | | | | | | | Try to solve csharp build issue on mac | Yuchen Zeng | 2016-08-11 |
| | | | | | | | | |||
* | | | | | | | | Fix csharp on mac os | Yuchen Zeng | 2016-08-10 |
| | | | | | | | | |||
| | | | | | | * | Remove use of verify-install target in Makefile | murgatroid99 | 2016-08-10 |
| | | | | | | | | |||
| | | | | | | * | Remove warning about protobuf 3.0.0+ from the Makefile | murgatroid99 | 2016-08-10 |
| | | |_|_|_|/ | | |/| | | | | |||
* | | | | | | | Fix node test | Yuchen Zeng | 2016-08-10 |
| | | | | | | | |||
* | | | | | | | Fix sanity issues, try to fix node build | Yuchen Zeng | 2016-08-09 |
| | | | | | | | |||
| | | * | | | | php: update package.xml | Stanley Cheung | 2016-08-09 |
| | |/ / / / | |||
* | | | | | | Fix asan issue, ignore invalid-source-encoding warning when building c-ares ↵ | Yuchen Zeng | 2016-08-09 |
| | | | | | | | | | | | | | | | | | | | | | | | | with clang | ||
| | | | | * | add all runtime nodes back into testing packages | Alexander Polcyn | 2016-08-09 |
| | | |_|/ | | |/| | | |||
* | | | | | Separate event driver from ares wrapper | Yuchen Zeng | 2016-08-08 |
| | | | | | |||
* | | | | | Fix multi-core build issue | Yuchen Zeng | 2016-08-08 |
| | | | | | |||
* | | | | | Try fixing the ares_build.h generation issue | Yuchen Zeng | 2016-08-05 |
| | | | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into cares | Yuchen Zeng | 2016-08-05 |
|\| | | | | |||
* | | | | | Implement c-ares based dns resolver | Yuchen Zeng | 2016-08-05 |
| | | | | | |||
| * | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-03 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt Makefile build.yaml package.json src/core/lib/surface/version.c src/csharp/Grpc.Auth/project.json src/csharp/Grpc.Core/VersionInfo.cs src/csharp/Grpc.Core/project.json src/csharp/Grpc.HealthCheck/project.json src/csharp/build_packages.bat src/node/health_check/package.json src/node/tools/package.json src/python/grpcio/grpc_version.py src/python/grpcio_health_checking/grpc_version.py src/python/grpcio_tests/grpc_version.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb tools/distrib/python/grpcio_tools/grpc_version.py tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.c++.internal tools/doxygen/Doxyfile.core tools/doxygen/Doxyfile.core.internal | ||
| | | * | | | update templates to not include runtime sections in project.json | Alexander Polcyn | 2016-08-02 |
| | | | | | |