Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #7391 from dgquintas/lr_july_16 | Nicolas Noble | 2016-08-01 |
|\ | | | | | Load Reporting Filter | ||
| * | clang-format | David Garcia Quintas | 2016-08-01 |
| | | |||
| * | Merge branch 'master' of github.com:grpc/grpc into lr_july_16 | David Garcia Quintas | 2016-08-01 |
| |\ | |/ |/| | |||
* | | Merge pull request #7553 from podsvirov/topic-cmake-template | Nicolas Noble | 2016-07-29 |
|\ \ | | | | | | | CMake Project Improvements | ||
* \ \ | Merge pull request #7584 from nicolasnoble/manual-upmerge | Nicolas Noble | 2016-07-29 |
|\ \ \ | | | | | | | | | Manual upmerge from v1.0.x | ||
* \ \ \ | Merge pull request #7582 from stanley-cheung/php-fix-zts-error | Stanley Cheung | 2016-07-29 |
|\ \ \ \ | | | | | | | | | | | PHP: missed a macro | ||
| | * | | | 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 | ||
| * | | | | php: missed a macro; | Stanley Cheung | 2016-07-29 |
|/ / / / | |||
* | | | | Merge pull request #7576 from apolcyn/fix_sanity_test_diff | kpayson64 | 2016-07-29 |
|\ \ \ \ | | | | | | | | | | | compare test config as objects instead of strings | ||
| | * \ \ | Merge pull request #7568 from apolcyn/update_tests_for_new_nuget_ga | kpayson64 | 2016-07-29 |
| | |\ \ \ | | | | | | | | | | | | | update to use new nuget client in tests | ||
| | * \ \ \ | Merge pull request #7569 from dgquintas/backport_cpp_compression_level | Nicolas Noble | 2016-07-29 |
| | |\ \ \ \ | | | | | | | | | | | | | | | backport #7502 from dgquintas/cpp_compression_level | ||
| * | | | | | | compare test config as objects instead of strings | Alex Polcyn | 2016-07-28 |
| | | | | | | | |||
| | | * | | | | Merge pull request #7502 from dgquintas/cpp_compression_level | Nicolas Noble | 2016-07-28 |
| | |/ / / / | | | | | | | | | | | | | C++ Compression Level set properly | ||
* | | | | | | Merge pull request #7502 from dgquintas/cpp_compression_level | Nicolas Noble | 2016-07-28 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | C++ Compression Level set properly | ||
| | | | | | * | clang-format | David Garcia Quintas | 2016-07-28 |
| | | | | | | | |||
| | | | * | | | update to use new nuget client in tests | Alexander Polcyn | 2016-07-28 |
| | | |/ / / | |||
| | | * | | | Merge pull request #7551 from murgatroid99/ruby_tools_plugin_arg | Nicolas Noble | 2016-07-28 |
| | | |\ \ \ | | | | | | | | | | | | | | | Ruby Tools: automatically include plugin argument in protoc command | ||
| | | | * \ \ | Merge remote-tracking branch 'upstream/v1.0.x' into ruby_tools_plugin_arg | murgatroid99 | 2016-07-28 |
| | | | |\ \ \ | | | | |/ / / | | | |/| | | | |||
* | | | | | | | Merge pull request #7561 from stanley-cheung/php-cleanup-ga | Stanley Cheung | 2016-07-28 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PHP: cleanup for GA | ||
| | | | * \ \ \ | Merge pull request #7560 from stanley-cheung/php-cleanup-ga-v1_0 | Stanley Cheung | 2016-07-28 |
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | PHP: cleanup for GA | ||
| | | | | * | | | | php: cleanup for GA | Stanley Cheung | 2016-07-28 |
| | | | |/ / / / | |||
| * | | / / / / | php: cleanup for GA | Stanley Cheung | 2016-07-28 |
|/ / / / / / / | |||
| | | * | | | | Merge pull request #7543 from thinkerou/wrap_php7_on_v1_branch_third | Stanley Cheung | 2016-07-28 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | PHP: use php7_wrapper to reduce duplicated codes on v1.0.x branch(final part) | ||
* | | | \ \ \ \ | Merge pull request #7552 from thinkerou/wrap_php7_third | Stanley Cheung | 2016-07-28 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | PHP: use php7_wrapper to reduce duplicated codes(final part) | ||
| | | | * | | | | add macro PHP_GRPC_INIT_HANDLER | thinkerou | 2016-07-28 |
| | | | | | | | | |||
| * | | | | | | | add macro PHP_GRPC_INIT_HANDLER | thinkerou | 2016-07-28 |
| | | | | | | | | |||
| | | | * | | | | delete commented-code for missing | thinkerou | 2016-07-28 |
| | | | | | | | | |||
| * | | | | | | | delete commented-code for missing | thinkerou | 2016-07-28 |
| | | | | | | | | |||
| | | | * | | | | add PHP_GRPC_FREE_CLASS_OBJECT macro | thinkerou | 2016-07-28 |
| | | | | | | | | |||
| * | | | | | | | add PHP_GRPC_FREE_CLASS_OBJECT macro | thinkerou | 2016-07-28 |
| | | | | | | | | |||
| | | | * | | | | fix unused var | thinkerou | 2016-07-28 |
| | | | | | | | | |||
| * | | | | | | | fix unused var | thinkerou | 2016-07-28 |
| | | | | | | | | |||
| | | | | | * | | CMake: Fix configuration file format bug | Konstantin Podsvirov | 2016-07-28 |
| | | | | | | | | |||
| | | | | | * | | CMake: project for HelloWorld cpp example | Konstantin Podsvirov | 2016-07-28 |
| | | | | | | | | |||
| | | | | | * | | CMake: Installation and Export Configuration | Konstantin Podsvirov | 2016-07-28 |
| | | | | | | | | |||
| | | | | | * | | CMake: Choice third party provider | Konstantin Podsvirov | 2016-07-28 |
| |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | Now we can use submodules or external packages | ||
| | | * | | | | Merge pull request #7534 from murgatroid99/ruby_tools_script_naming | kpayson64 | 2016-07-27 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | Remove .rb suffix from grpc-tools scripts, to be consistent with other gems | ||
| | | | | * | | | add some macro to reduce duplicate code | thinkerou | 2016-07-28 |
| | | | | | | | | |||
| * | | | | | | | add some macro to reduce duplicate code | thinkerou | 2016-07-28 |
| | | | | | | | | |||
* | | | | | | | | Merge pull request #7535 from muxi/fix-no-as-needed | Nicolas Noble | 2016-07-27 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Removed --no-as-needed options from Makefile of HelloWorld and RouteGuide | ||
* \ \ \ \ \ \ \ \ | Merge pull request #7546 from tberghammer/proto-lite | Nicolas Noble | 2016-07-27 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add cmake option to compile using protobuf-lite | ||
| | | | | | | | * | | Ruby Tools: automatically include plugin argument in protoc command | murgatroid99 | 2016-07-27 |
| | | | | | |_|/ / | | | | | |/| | | | |||
| | | | | * | | | | Merge pull request #7537 from kpayson64/regen_ruby_protos | kpayson64 | 2016-07-27 |
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Updated ruby protos to use new _pb filename | ||
| | | | | * \ \ \ \ | Merge pull request #7380 from nicolasnoble/no-c++11-threads | Vijay Pai | 2016-07-27 |
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Avoid using certain C++11-isms with grpc::thread, as it's not necessarily std::thread. | ||
* | | | | | \ \ \ \ \ | Merge pull request #7459 from nicolasnoble/udp_test_bitrot | Vijay Pai | 2016-07-27 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixing udp test bitrotting. | ||
| | * | | | | | | | | | | Add cmake option to compile using protobuf-lite | Tamas Berghammer | 2016-07-27 |
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After this change specifying -DGRPC_USE_PROTO_LITE=On at the cmake command line will cause gRPC to use the protobuf-lite runtime what can result in a major size improvement. | ||
| | | | | | | | | * | | add php_grpc_zend_object macro and rename klass | thinkerou | 2016-07-27 |
| | | | | | | | | | | | |||
| | | * | | | | | | | | add php_grpc_zend_object macro and rename klass | thinkerou | 2016-07-27 |
| | | | | | | | | | | | |||
| | | | | * | | | | | | Merge pull request #7541 from stanley-cheung/php-cleanup-dockerfile-v1_0 | Stanley Cheung | 2016-07-26 |
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | PHP: add PHP7 to various Jenkins tests and update dockerfile | ||
| | | | | | | | | | | * | removed some bits from invalid LR design | David Garcia Quintas | 2016-07-26 |
| | | | | | | | | | | | |