aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
...
* | | | | | Merge pull request #7378 from kpayson64/py_doc_touchupGravatar kpayson642016-07-14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Document rpc details as string type
| | * | | | | php: fix interop tests breakageGravatar Stanley Cheung2016-07-13
| |/ / / / / |/| | | | |
| | * | | | Remove Python 'loader' hackGravatar Masood Malekghassemi2016-07-13
| | | | | |
* | | | | | Merge pull request #7346 from murgatroid99/ruby_ga_documentation_fixesGravatar Nicolas Noble2016-07-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Improved some Ruby inline documentation
| | | | | | * And remaining random leftover items.Gravatar Nicolas "Pixel" Noble2016-07-14
| | | | | | |
| | | * | | | Move Python.h include out of loader codeGravatar Masood Malekghassemi2016-07-13
| |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | To make a certain private code base work in a certain way nicer than the current way.
| | | | * | Checking in new roots.Gravatar Julien Boeuf2016-07-13
| |_|_|/ / |/| | | |
* | | | | Merge pull request #7363 from stanley-cheung/php-prepare-for-ga-v1_0branchGravatar kpayson642016-07-13
|\ \ \ \ \ | | | | | | | | | | | | php: prepare for GA release
* \ \ \ \ \ Merge pull request #7375 from soltanmm/zomgGravatar kpayson642016-07-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix missing source file
* \ \ \ \ \ \ Merge pull request #7354 from soltanmm/prescribe-more-restGravatar kpayson642016-07-13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Restructure reStructured text to be valid
| | | | | * | | Document rpc details as string typeGravatar Ken Payson2016-07-13
| | | | | | | |
| | | | | | * | Don't always import Protobuf like a frameworkGravatar Jorge Canizales2016-07-13
| |_|_|_|_|/ / |/| | | | | | | | | | | | | If the macro isn't set, e.g. for Bazel compilations, import the way it was done before https://github.com/grpc/grpc/commit/fb4a54541a6e00c43e1671cda0a25e2eda4792df.
| | * | | | | Fix missing source fileGravatar Masood Malekghassemi2016-07-13
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #7366 from y-zeng/fix-chttp2-parsing-msgGravatar kpayson642016-07-13
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Remove unnecessary "Failed parsing HTTP2" detail
| | | | | * Use the new socket creation api in udp_server.cGravatar Robbie Shade2016-07-13
| | | | | |
| | | | | * Use grpc_error instead of bool in udp_server's on_readGravatar Robbie Shade2016-07-13
| | | | | |
| | | | | * Correct error handling for failed set_sockopt calls in udp_server.cGravatar Robbie Shade2016-07-13
| | | | | |
| | | * | | add back version to composer.json fileGravatar Stanley Cheung2016-07-13
| | | | | |
* | | | | | Merge pull request #7359 from jcanizales/p0-protoc-podspecGravatar makdharma2016-07-13
|\ \ \ \ \ \ | | | | | | | | | | | | | | Distribute ProtoC and the plugin as pods
| | | | * | | php: prepare for GA releaseGravatar Stanley Cheung2016-07-13
| |_|_|/ / / |/| | | | |
* | | | | | 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.
| | | | | * | Restructure reStructured text to be validGravatar Masood Malekghassemi2016-07-12
| |_|_|_|/ / |/| | | | |
| | * | | | 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
| | | | | | |
| | | | | | * Improved some Ruby inline documentationGravatar murgatroid992016-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