aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge pull request #7366 from y-zeng/fix-chttp2-parsing-msgGravatar kpayson642016-07-13
|\ | | | | Remove unnecessary "Failed parsing HTTP2" detail
* \ Merge pull request #7359 from jcanizales/p0-protoc-podspecGravatar makdharma2016-07-13
|\ \ | | | | | | Distribute ProtoC and the plugin as pods
* \ \ Merge pull request #7355 from soltanmm/count-bleckGravatar kpayson642016-07-13
|\ \ \ | | | | | | | | Add special methods to generated Python docs
| | * | Set Travis clone depth to 1, to alleviate workloadGravatar Jorge Canizales2016-07-13
| | | | | | | | | | | | This should make Travis only test the last commit of every PR.
| | * | Fix Travis not finding !ProtoCompiler-gRPC.podspecGravatar Jorge Canizales2016-07-13
| | | |
* | | | Merge pull request #7356 from nicolasnoble/cherry-pick-fixGravatar Nicolas Noble2016-07-12
|\ \ \ \ | | | | | | | | | | Use test roots.pem in test - cherry-picking for v1.0.x
| * | | | Use test roots.pem in testGravatar yang-g2016-07-13
|/ / / /
* | | | Merge pull request #7350 from nicolasnoble/upmerge-0_15-1_0Gravatar Jorge Canizales2016-07-12
|\ \ \ \ | | | | | | | | | | Upmerge 0.15 -> 1.0
* \ \ \ \ Merge pull request #7338 from kpayson64/remove_py_cruftGravatar kpayson642016-07-12
|\ \ \ \ \ | | | | | | | | | | | | Removed early adopter code
| | | * | | Add special methods to generated Python docsGravatar Masood Malekghassemi2016-07-12
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | Also removes an old-now-spurious `make` invocation from the docgen.py helper script.
| | * | | Merge branch 'release-0_15' into v1.0.xGravatar Nicolas "Pixel" Noble2016-07-13
| |/| | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitmodules gRPC.podspec
| | * | | Merge pull request #7341 from nicolasnoble/podspec-no-template-0_15Gravatar Jorge Canizales2016-07-12
| | |\ \ \ | | | | | | | | | | | | gRPC.podspec shouldn't be a template anymore.
| * | | | | Remove early adopter codeGravatar Ken Payson2016-07-12
| | | | | |
| | | * | | Bringing 0.15 to protobuf beta 3.3 to satisfy both nodejs and objc.Gravatar Nicolas "Pixel" Noble2016-07-12
| | | | | |
* | | | | | Merge pull request #7342 from kpayson64/python_metadata_defGravatar kpayson642016-07-12
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added Glossary to docs with metadata definition
| | | | * | Fix TravisGravatar Jorge Canizales2016-07-12
| | | | | |
| * | | | | Added Glossary to docs with metadata definitionGravatar Ken Payson2016-07-12
|/ / / / /
| | * / / gRPC.podspec shouldn't be a template anymore.Gravatar Nicolas "Pixel" Noble2016-07-12
| |/ / /
* | | | Merge pull request #7335 from nicolasnoble/master-is-1.0.0-pre1Gravatar Nicolas Noble2016-07-12
|\ \ \ \ | | | | | | | | | | Flagging master as 1.0.0-pre1.
| * | | | Flagging master as 1.0.0-pre1.Gravatar Nicolas "Pixel" Noble2016-07-12
|/ / / /
* | | | Merge pull request #7322 from kpayson64/py_status_code_messageGravatar kpayson642016-07-11
|\ \ \ \ | | | | | | | | | | Implemented python status_code_and_message interop test
* \ \ \ \ Merge pull request #7315 from kpayson64/fix_exit_testGravatar kpayson642016-07-11
|\ \ \ \ \ | | | | | | | | | | | | Updated exit_test for new grpc.Server API
* \ \ \ \ \ Merge pull request #7323 from kpayson64/fix_py_qpsGravatar kpayson642016-07-11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Updated python qps tests to use GA server API
* \ \ \ \ \ \ Merge pull request #7329 from nicolasnoble/upmerge-masterGravatar Nicolas Noble2016-07-11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Upmerge from 0.15 to master.
| | * | | | | | Updated python qps tests to use GA server APIGravatar Ken Payson2016-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should have been included as part of 45c0f2b3051bf1642337e109df57e8031cb654c8
| * | | | | | | Addressing comments.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 pull request #7321 from nicolasnoble/upmergeGravatar Nicolas Noble2016-07-11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Upmerge 0.14 -> 0.15
* | \ \ \ \ \ \ Merge pull request #7291 from ctiller/better_statusGravatar Nicolas Noble2016-07-11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Make it more likely to correctly report deadline exceeded
* \ \ \ \ \ \ \ \ Merge pull request #7292 from y-zeng/fix_mac_buildGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix make errors on mac
* \ \ \ \ \ \ \ \ \ Merge pull request #7310 from kpayson64/hold_gil_during_cleanupGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Hold onto the GIL in __dealloc__ functions
| | | | | | | * | | | Updated exit_test for new grpc.Server APIGravatar Ken Payson2016-07-11
| | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should have been part of a6b2a5a090ff057f77976b22d854ff375883c1b9
| | | | | | | * | | Implemented python status_code_and_message interop testGravatar Ken Payson2016-07-11
| | | | | | | | | |
| | | | | * | | | | 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
| | | * | | | | | | clang-formatGravatar Craig Tiller2016-07-11
| | | | | | | | | |
| | * | | | | | | | Merge remote-tracking branch 'upstream/master' into fix_mac_buildGravatar Yuchen Zeng2016-07-11
| | |\ \ \ \ \ \ \ \
| | | | | | | | | | * Remove unnecessary parsing detailGravatar Yuchen Zeng2016-07-11
| | | | |_|_|_|_|_|/ | | | |/| | | | | |
* | | | | | | | | | Merge pull request #7297 from dgquintas/compression_cookbookGravatar Nicolas Noble2016-07-11
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Compression Cookbook
| | | | | | | | | * Merge master to resolve tests podspec conflictGravatar Jorge Canizales2016-07-11
| | | | | | | | | |\ | | | | | | | | |_|/ | | | | | | | |/| |
| | | | | | | | | * Fix: Cocoapods doesn’t like dirs that start with ./Gravatar Jorge Canizales2016-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wasted a huge amount of time debugging this madness.
* | | | | | | | | | Merge pull request #7312 from kpayson64/fix_sanityGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | Updated composer.json template
| * | | | | | | | | Updated composer.json.templateGravatar Ken Payson2016-07-11
|/ / / / / / / / /
| | | | | | | | * Tests Podfile cleanupGravatar Jorge Canizales2016-07-11
| | | | | | | | |
| | | | | | | | * Use the deployed protoc spec in samples and READMEGravatar Jorge Canizales2016-07-11
| | | | | | | | |
* | | | | | | | | Merge pull request #7235 from tberghammer/cmake-protobufGravatar Nicolas Noble2016-07-11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove gmock protobuf dependency from cmake build
| | | * | | | | | | Hold onto the GIL in __dealloc__ functionsGravatar Ken Payson2016-07-11
| | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a child thread triggers __dealloc__ as part of a thread being joined, the thread is already considered to be "joined", and so releasing the GIL can allow the main thread to proceed to exit, which introduces shutdown race conditions/memory leaks.
* | | | | | | | | Merge pull request #7242 from yang-g/importGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove unused file
* \ \ \ \ \ \ \ \ \ Merge pull request #7286 from stanley-cheung/php-update-authGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | PHP: update composer.json
* \ \ \ \ \ \ \ \ \ \ Merge pull request #7289 from stanley-cheung/php-remove-debugGravatar kpayson642016-07-11
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | PHP: remove gpr_log debug
| | | | | | | | | | | * gRPC plugin podspec: license & deployment targetGravatar Jorge Canizales2016-07-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the spec to pass linting.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 19:34:52 +0000