aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
Commit message (Collapse)AuthorAge
* Merge branch 'release-0_15' into v1.0.xGravatar Nicolas "Pixel" Noble2016-07-13
|\ | | | | | | | | | | Conflicts: .gitmodules gRPC.podspec
| * gRPC.podspec shouldn't be a template anymore.Gravatar Nicolas "Pixel" Noble2016-07-12
| |
* | Merge branch 'release-0_15' into upmerge-masterGravatar Nicolas "Pixel" Noble2016-07-12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile build.yaml gRPC-Core.podspec gRPC.podspec package.json package.xml 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/tools/package.json src/python/grpcio/grpc/__init__.py src/python/grpcio/grpc_version.py src/python/grpcio_tests/tests/unit/_rpc_test.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb templates/gRPC.podspec.template 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 tools/run_tests/port_server.py
| * Merge branch 'release-0_14' into release-0_15Gravatar Nicolas "Pixel" Noble2016-07-12
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec src/objective-c/BoringSSL.podspec src/objective-c/examples/RemoteTestClient/RemoteTest.podspec src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj src/objective-c/tests/Podfile templates/gRPC.podspec.template third_party/protobuf
* | | Updated composer.json.templateGravatar Ken Payson2016-07-11
| | |
* | | Merge pull request #7235 from tberghammer/cmake-protobufGravatar Nicolas Noble2016-07-11
|\ \ \ | | | | | | | | Remove gmock protobuf dependency from cmake build
* \ \ \ Merge pull request #7195 from soltanmm/winfixGravatar kpayson642016-07-08
|\ \ \ \ | | | | | | | | | | Fix Python interop unit-tests on Windows
* \ \ \ \ Merge pull request #7203 from murgatroid99/node_separate_health_checkGravatar Nicolas Noble2016-07-08
|\ \ \ \ \ | | | | | | | | | | | | Split Node health check code into a separate package and make it use static codegen
| | * | | | Make Python build standalone on WindowsGravatar Masood Malekghassemi2016-07-08
| |/ / / / |/| | | |
* | | | | Merge pull request #7219 from jcanizales/merge-0.14-into-masterGravatar makdharma2016-07-08
|\ \ \ \ \ | | | | | | | | | | | | Merge 0.14 into master
* \ \ \ \ \ Merge pull request #6791 from soltanmm/painGravatar kpayson642016-07-06
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make running individual Python tests less painful
| | | | * | | Remove gmock protobuf dependency from cmake buildGravatar Tamas Berghammer2016-07-06
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A full build of protobuf depends on gmock even though it is not part of a standrad checkout. This CL explicitly disable the build of the protobuf tests to get rid of this dependency. If somebody want to build the protobuf tests then they have to download gmock to the protobuf directory and specify -Dprotobuf_BUILD_TESTS=ON to the cmake command line. Fixes https://github.com/grpc/grpc/issues/7233
* | | | | | Merge pull request #7210 from ctiller/no-more-zookeeperGravatar Nicolas Noble2016-07-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | Expunge all references to zookeeper
| | | * \ \ \ Merge master into merge-0.14-into-masterGravatar Jorge Canizales2016-07-01
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | The protobuf commit conflicted. Resolved to the latest one.
* | | | | | | Regenerating project files, and adding experimental disclaimer.Gravatar Nicolas "Pixel" Noble2016-07-02
| | | | | | |
* | | | | | | Merge remote-tracking branch 'google/master' into contrib-cmakeGravatar Nicolas "Pixel" Noble2016-07-02
|\ \ \ \ \ \ \
| | * | | | | | Expunge all references to zookeeperGravatar Craig Tiller2016-07-01
| |/ / / / / /
| | * | | | | Remove toxGravatar Masood Malekghassemi2016-07-01
| | | | | | |
| | * | | | | Organize Python tests to use grpcio-tools directlyGravatar Masood Malekghassemi2016-07-01
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Moves all tests into a separate package. This does not change existing supported means of running tests (e.g. through run_tests.py).
| | | * / / Split Node health check code into a separate package and make it use static ↵Gravatar murgatroid992016-07-01
| | |/ / / | |/| | | | | | | | | | | | | codegen
| | * | | Merge master into merge-0.14-into-masterGravatar Jorge Canizales2016-06-30
| | |\ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: - gRPC.podspec - Only had non-trivial changes in the core file list, which will need to be regenerated (in gRPC-Core.podspec). - src/objective-c/BoringSSL.podspec - Had trivial conflicts in the version. - src/objective-c/examples/RemoteTestClient/RemoteTest.podspec - Trivial conflicts in quoting. - src/objective-c/examples/Sample/Sample.xcodeproj/project.pbxproj and src/objective-c/examples/SwiftSample/SwiftSample.xcodeproj/project.pbxproj - The master version is used, pending testing. The 0.14 version had emoji and some unneeded entries. - src/objective-c/tests/Podfile - Added CronetFramework pod, and warning silencing from master. - templates/gRPC.podspec.template - Deleted. - third_party/protobuf - Using master commit, but need to verify if it works for frameworks.
| * | | Merge pull request #7155 from stanley-cheung/php-fix-call-destroyGravatar Jan Tattermusch2016-06-30
| |\ \ \ | | | | | | | | | | PHP: fix shutdown hang issue
| | | | * php: update package.xmlGravatar Stanley Cheung2016-06-30
| | | | |
| | * | | php: update package.xmlGravatar Stanley Cheung2016-06-30
| | | | |
| * | | | using shared option for Version.cs leaks it to nuget fileGravatar Jan Tattermusch2016-06-29
| | | | |
| * | | | fix files/mappings in Grpc.Core nugetGravatar Jan Tattermusch2016-06-29
| | | | |
| * | | | build experimental nugets with dotnet CLIGravatar Jan Tattermusch2016-06-29
| |/ / /
| | * | Divide gRPC-Core in Interface & Impl subspecsGravatar Jorge Canizales2016-06-28
| | | | | | | | | | | | | | | | | | | | | | | | This works around the Cocoapods' linter header_mapping_dir restrictions. Incidentally, it also removes the need to set build settings in the user target.
| | * | BoringSSL: move podspec to v4Gravatar Jorge Canizales2016-06-28
| | | |
| * | | modify templates to sign C# coreclr projects and generate xmlDocGravatar Jan Tattermusch2016-06-27
| | | |
| * | | share Version.cs among all project.json projectsGravatar Jan Tattermusch2016-06-27
| | | |
| * | | switch CoreCLR to preview2Gravatar Jan Tattermusch2016-06-27
| | |/ | |/|
| * | Merge pull request #6104 from jtattermusch/coreclr_supportGravatar Jan Tattermusch2016-06-22
| |\ \ | | | | | | | | Add experimental CoreCLR support
* | | | Improve the generated cmake build filesGravatar Tamas Berghammer2016-06-22
| | | | | | | | | | | | | | | | | | | | | | | | * Add project name and version number * Fix zlib dependency of grpc * Include more target (all, protoc, tool groups)
| * | | Make src/node/tools/package.json consistent with its templateGravatar murgatroid992016-06-21
| | | |
| | * | use template to generate project.json filesGravatar Jan Tattermusch2016-06-21
| | | |
* | | | Generate a simple cmake build fileGravatar Tamas Berghammer2016-06-21
|/ / / | | | | | | | | | | | | | | | | | | This cmake file only builds the C and C++ code and all the third party dependencies with very few configuration options but it supports building on Linux and OSX as well as cross compiling. (tested {Linux, OSX} -> Android { arm, aarch64, x86 })
* | | Merge pull request #6954 from dgquintas/protoc_include_pathGravatar Nicolas Noble2016-06-20
|\ \ \ | | | | | | | | Added third_party/protobuf/src to protoc's include path
| | * | add csharp CoreCLR docker imageGravatar Jan Tattermusch2016-06-17
| | | |
* | | | Merge branch 'master' into wheezyGravatar Vijay Pai2016-06-17
|\ \ \ \
| | * | | Added third_party/protobuf/src to protoc's include pathGravatar David Garcia Quintas2016-06-17
| |/ / /
| * | | Merge pull request #6902 from sreecha/php_stress_testGravatar Jan Tattermusch2016-06-17
| |\ \ \ | | | | | | | | | | PHP stress client in stress test framework
| * | | | Disable ccache for clang-3.4 on Ubuntu 14.04 as this is not currently working.Gravatar Vijay Pai2016-06-16
| | | | | | | | | | | | | | | | | | | | Disabling it allows clang-3.4 to run C/C++ on docker
* | | | | Merge branch 'master' into wheezyGravatar Vijay Pai2016-06-15
|\| | | |
* | | | | Exclude boringssl tests and libs from C++ build if EMBED_OPENSSL isGravatar vjpai2016-06-15
| | | | | | | | | | | | | | | | | | | | not true
| * | | | Merge remote-tracking branch 'upstream/master' into ↵Gravatar Jan Tattermusch2016-06-15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | manual_upmerge_0_14_to_master
| | | * | | PHP stress client in stress test frameworkGravatar Sree Kuchibhotla2016-06-14
| | |/ / /
| | | * / add support for CoreCLRGravatar Jan Tattermusch2016-06-14
| | |/ /
| | * | php: remove explicit version in composer.jsonGravatar Stanley Cheung2016-06-13
| | | |
| * | | Merge remote-tracking branch 'upstream/release-0_14' into HEADGravatar Jan Tattermusch2016-06-13
| |\ \ \ | | |/ / | |/| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 01:13:04 +0000