Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #7203 from murgatroid99/node_separate_health_check | Nicolas Noble | 2016-07-08 |
|\ | | | | | Split Node health check code into a separate package and make it use static codegen | ||
* \ | Merge pull request #7219 from jcanizales/merge-0.14-into-master | makdharma | 2016-07-08 |
|\ \ | | | | | | | Merge 0.14 into master | ||
* \ \ | Merge pull request #6791 from soltanmm/pain | kpayson64 | 2016-07-06 |
|\ \ \ | | | | | | | | | Make running individual Python tests less painful | ||
* \ \ \ | Merge pull request #7210 from ctiller/no-more-zookeeper | Nicolas Noble | 2016-07-01 |
|\ \ \ \ | | | | | | | | | | | Expunge all references to zookeeper | ||
| | | * \ | Merge master into merge-0.14-into-master | Jorge Canizales | 2016-07-01 |
| | | |\ \ | |_|_|/ / |/| | | | | | | | | | The protobuf commit conflicted. Resolved to the latest one. | ||
* | | | | | Regenerating project files, and adding experimental disclaimer. | Nicolas "Pixel" Noble | 2016-07-02 |
| | | | | | |||
* | | | | | Merge remote-tracking branch 'google/master' into contrib-cmake | Nicolas "Pixel" Noble | 2016-07-02 |
|\ \ \ \ \ | |||
| | * | | | | Expunge all references to zookeeper | Craig Tiller | 2016-07-01 |
| |/ / / / | |||
| | * | | | Remove tox | Masood Malekghassemi | 2016-07-01 |
| | | | | | |||
| | * | | | Organize Python tests to use grpcio-tools directly | Masood Malekghassemi | 2016-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 ↵ | murgatroid99 | 2016-07-01 |
| | |/ | |/| | | | | | | | codegen | ||
| | * | Merge master into merge-0.14-into-master | Jorge Canizales | 2016-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-destroy | Jan Tattermusch | 2016-06-30 |
| |\ \ | | | | | | | | | PHP: fix shutdown hang issue | ||
| | * | | php: update package.xml | Stanley Cheung | 2016-06-30 |
| | | | | |||
| * | | | using shared option for Version.cs leaks it to nuget file | Jan Tattermusch | 2016-06-29 |
| | | | | |||
| * | | | fix files/mappings in Grpc.Core nuget | Jan Tattermusch | 2016-06-29 |
| | | | | |||
| * | | | build experimental nugets with dotnet CLI | Jan Tattermusch | 2016-06-29 |
| |/ / | |||
| | * | Divide gRPC-Core in Interface & Impl subspecs | Jorge Canizales | 2016-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 v4 | Jorge Canizales | 2016-06-28 |
| | | | |||
| * | | modify templates to sign C# coreclr projects and generate xmlDoc | Jan Tattermusch | 2016-06-27 |
| | | | |||
| * | | share Version.cs among all project.json projects | Jan Tattermusch | 2016-06-27 |
| | | | |||
| * | | switch CoreCLR to preview2 | Jan Tattermusch | 2016-06-27 |
| | | | |||
| * | | Merge pull request #6104 from jtattermusch/coreclr_support | Jan Tattermusch | 2016-06-22 |
| |\ \ | | | | | | | | | Add experimental CoreCLR support | ||
* | | | | Improve the generated cmake build files | Tamas Berghammer | 2016-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 template | murgatroid99 | 2016-06-21 |
| | | | | |||
| | * | | use template to generate project.json files | Jan Tattermusch | 2016-06-21 |
| | | | | |||
* | | | | Generate a simple cmake build file | Tamas Berghammer | 2016-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_path | Nicolas Noble | 2016-06-20 |
|\ \ \ | | | | | | | | | Added third_party/protobuf/src to protoc's include path | ||
| | * | | add csharp CoreCLR docker image | Jan Tattermusch | 2016-06-17 |
| | | | | |||
* | | | | Merge branch 'master' into wheezy | Vijay Pai | 2016-06-17 |
|\ \ \ \ | |||
| | * | | | Added third_party/protobuf/src to protoc's include path | David Garcia Quintas | 2016-06-17 |
| |/ / / | |||
| * | | | Merge pull request #6902 from sreecha/php_stress_test | Jan Tattermusch | 2016-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. | Vijay Pai | 2016-06-16 |
| | | | | | | | | | | | | | | | | | | | | Disabling it allows clang-3.4 to run C/C++ on docker | ||
* | | | | | Merge branch 'master' into wheezy | Vijay Pai | 2016-06-15 |
|\| | | | | |||
* | | | | | Exclude boringssl tests and libs from C++ build if EMBED_OPENSSL is | vjpai | 2016-06-15 |
| | | | | | | | | | | | | | | | | | | | | not true | ||
| * | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Jan Tattermusch | 2016-06-15 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | manual_upmerge_0_14_to_master | ||
| | | * | | | PHP stress client in stress test framework | Sree Kuchibhotla | 2016-06-14 |
| | |/ / / | |||
| | | * / | add support for CoreCLR | Jan Tattermusch | 2016-06-14 |
| | |/ / | |||
| | * | | php: remove explicit version in composer.json | Stanley Cheung | 2016-06-13 |
| | | | | |||
| * | | | Merge remote-tracking branch 'upstream/release-0_14' into HEAD | Jan Tattermusch | 2016-06-13 |
| |\ \ \ | | |/ / | |/| | | |||
| * | | | add support for clang3.5, clang3.7 and gcc4.6 | Jan Tattermusch | 2016-06-11 |
| | | | | |||
* | | | | Add g++ | Vijay Pai | 2016-06-09 |
|/ / / | |||
| | * | gRPC-Core.podspec: Clarify where the template is | Jorge Canizales | 2016-06-09 |
| | | | |||
| | * | Clean up and document gRPC-Core.podspec better | Jorge Canizales | 2016-06-08 |
| | | | |||
| | * | gRPC-Core.podspec: init submodules, for nanopb | Jorge Canizales | 2016-06-08 |
| | | | |||
| | * | Add modulemap for gRPC core | Jorge Canizales | 2016-06-08 |
| | | | |||
| | * | Separate Core, ProtoRuntime, and RxLibrary subspecs | Jorge Canizales | 2016-06-08 |
| |/ | |||
* | | Merge github.com:grpc/grpc into c++-is-people-too | Craig Tiller | 2016-06-06 |
|\ \ | |||
| * \ | Merge pull request #6750 from makdharma/cronet | Jan Tattermusch | 2016-06-06 |
| |\ \ | | | | | | | | | cronet build related changes to build.yaml, and added ifdef guard around objective_c cronet code. | ||
* | | | | Merge github.com:grpc/grpc into c++-is-people-too | Craig Tiller | 2016-06-06 |
|\| | | |