Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #8048 from jtattermusch/dotnetcli_interoptest | Jan Tattermusch | 2016-09-12 |
|\ | | | | | Enable running interop tests with dotnet CLI + CoreCLR | ||
| * | fix copying data directory | Jan Tattermusch | 2016-09-09 |
| | | |||
| * | enable runing C# interop tests under coreclr | Jan Tattermusch | 2016-09-09 |
| | | |||
* | | add shutdownhook for CoreCLR | Jan Tattermusch | 2016-09-09 |
|/ | |||
* | allow building all nugets on linux | Jan Tattermusch | 2016-09-08 |
| | |||
* | dont enumerate runtimes in project.json file | Jan Tattermusch | 2016-09-08 |
| | |||
* | Merge pull request #7986 from jtattermusch/coreclr_interop_fixes | Jan Tattermusch | 2016-09-07 |
|\ | | | | | Improvements to CoreCLR support | ||
| * | upgrade Moq to version that supports netstandard1.3 | Jan Tattermusch | 2016-09-05 |
| | | |||
| * | cleanup of project.json files | Jan Tattermusch | 2016-09-05 |
| | | |||
| * | update Protobuf to 3.0.0 in project.json projects | Jan Tattermusch | 2016-09-05 |
| | | |||
| * | update Google.Apis.Auth to 1.16.0 for project.json projects | Jan Tattermusch | 2016-09-05 |
| | | |||
* | | Merge pull request #7758 from apolcyn/use_third_party_thread_pool_master | kpayson64 | 2016-09-02 |
|\ \ | | | | | | | Use thread pool from concurrent-ruby on ruby server | ||
* \ \ | Merge pull request #7912 from ctiller/g_stands_for | Craig Tiller | 2016-08-30 |
|\ \ \ | | | | | | | | | Specify the "g" in gRPC | ||
| * | | | Specify the "g" in gRPC | Craig Tiller | 2016-08-29 |
| | |/ | |/| | |||
* / | | php: error out if metadata key is not legal | Stanley Cheung | 2016-08-26 |
|/ / | |||
* | | Bazel: export LICENSE file. | Piotr Sikora | 2016-08-24 |
| | | | | | | | | Signed-off-by: Piotr Sikora <piotrsikora@google.com> | ||
* | | 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 | ||
| | * | | | 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 |
| |/| | |/| | | | |||
* | | | | Merge pull request #7762 from KindDragon/master | Nicolas Noble | 2016-08-18 |
|\ \ \ \ | | | | | | | | | | | Fix CMake for windows (VS2015) | ||
| | | * | | Move Podspecs to v1 | Jorge Canizales | 2016-08-18 |
| | | | | | |||
| * | | | | Fix CMake for Windows | Arkadiy Shapkin | 2016-08-18 |
| | | | | | |||
| | | | * | update gemspec in template | Alexander Polcyn | 2016-08-17 |
| | |_|/ | |/| | | |||
| | * | | Add PyPy 5.3.1 to dockerfile and template | siddharthshukla | 2016-08-17 |
| |/ / | |||
| | * | 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 |
|\ \ \ | |/ / |/| / | |/ | |||
| * | 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 | ||
| * \ | 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 | ||
| * | | | 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 |
| | |_|_|_|_|/ | |/| | | | | | |||
| | | | | | * | 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 |
| | |_|_|_|/ | |/| | | | | |||
| | * | | | | php: update package.xml | Stanley Cheung | 2016-08-09 |
| |/ / / / | |||
| | | | * | add all runtime nodes back into testing packages | Alexander Polcyn | 2016-08-09 |
| | |_|/ | |/| | | |||
* | | | | 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 |
| | | | | | |||
| | * | | | update nuget after installing in docker | Alexander Polcyn | 2016-08-02 |
| |/ / / | |||
* | | | | Merge pull request #7554 from muxi/fix-cronet-interop-test | Muxi Yan | 2016-08-02 |
|\ \ \ \ | | | | | | | | | | | Fix Objective-C test pods for Cronet tests | ||
| | | * \ | Merge remote-tracking branch 'upstream/v1.0.x' into node_dependency_update | murgatroid99 | 2016-08-02 |
| | | |\ \ | | | |/ / | | |/| | | |||
| | * | | | Merge pull request #7580 from jtattermusch/netcore_nuget_to_rtm | Jan Tattermusch | 2016-08-02 |
| | |\ \ \ | | | | | | | | | | | | | Update .NET core dependencies to RTM | ||
* | | \ \ \ | Merge pull request #7553 from podsvirov/topic-cmake-template | Nicolas Noble | 2016-07-29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | CMake Project Improvements | ||
* \ \ \ \ \ \ | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-07-29 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ruby/pb/test/client.rb src/ruby/pb/test/server.rb tools/dockerfile/test/php7_jessie_x64/Dockerfile | ||
| | | | * | | | use netcoreapp1.0 for executable projects | Jan Tattermusch | 2016-07-30 |
| | | | | | | |