aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Add csharp check to return val of byte_buffer_reader_initGravatar Alexander Polcyn2016-07-13
|
* Merge pull request #7357 from grpc/v1.0.xGravatar Jorge Canizales2016-07-13
|\ | | | | Automatic v1.0.x -> master upmerge
| * Merge pull request #7359 from jcanizales/p0-protoc-podspecGravatar makdharma2016-07-13
| |\ | | | | | | Distribute ProtoC and the plugin as pods
* | \ Merge pull request #7353 from kpayson64/fix_cygrpc_testGravatar kpayson642016-07-13
|\ \ \ | | | | | | | | Fix cygrpc test
* \ \ \ Merge pull request #7044 from yang-g/sliceGravatar kpayson642016-07-13
|\ \ \ \ | | | | | | | | | | Add API to get C slice from C++ Slice.
* \ \ \ \ Merge pull request #6539 from soltanmm/clngfrmt-aoaGravatar kpayson642016-07-13
|\ \ \ \ \ | | | | | | | | | | | | Add src/compiler to clang-formatting pass
| | | | * \ 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 #7248 from yang-g/server_testGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Initialize variable.
| | | | | * \ \ 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
| | | | * | | | | Change sequence of client/server eventsGravatar Ken Payson2016-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for https://github.com/grpc/grpc/pull/6737 when start_batch will no longer put data on the wire
* | | | | | | | | Merge pull request #7257 from yang-g/sequential_conGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Use test roots.pem in test
* \ \ \ \ \ \ \ \ \ Merge pull request #7317 from soltanmm/tadpolesGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Patch spawn for Python 'unix' compilers instead of link
* \ \ \ \ \ \ \ \ \ \ Merge pull request #7290 from soltanmm/auto-cyGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | Fallback to generating files if not generated
| | | | | | | * | | | 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
| | | | | | | | | | | |
| | * | | | | | | | | | Patch `spawn` for Python 'unix' compilers insteadGravatar Masood Malekghassemi2016-07-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before we patched the link command, now we just patch `spawn` as an updatable catch-all solution to ARG_MAX limitations on bash for MSYS and MinGW and friends.
| | | | | | | | | | * | Bringing 0.15 to protobuf beta 3.3 to satisfy both nodejs and objc.Gravatar Nicolas "Pixel" Noble2016-07-12
| | | | | | | | | | | |
| | | | | * | | | | | | Clang-format all the thingsGravatar Masood Malekghassemi2016-07-12
| | | | | | | | | | | |
| | | | | * | | | | | | Add src/compiler to clang formatGravatar Masood Malekghassemi2016-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
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #7330 from dgquintas/fix_tsanGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix tsan race
* \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6595 from thinkerou/timeGravatar kpayson642016-07-12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Merged some codes to the common function for maintainability in time.c file
| | | | | | | | | * | | | 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 remote-tracking branch 'upstream/master' into sliceGravatar yang-g2016-07-12
| | | | | | | |\ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| | | | | | * | | | | Merge remote-tracking branch 'upstream/master' into server_testGravatar yang-g2016-07-12
| | | | | | |\ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into sequential_conGravatar yang-g2016-07-12
| | | | | |\ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #7336 from nicolasnoble/master-is-1.1Gravatar Nicolas Noble2016-07-12
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | Master is now 1.1.0-dev.
| * | | | | | | | | | Master is now 1.1.0-dev.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.
| | | | | | * | | | | | | | Fix tsan raceGravatar David Garcia Quintas2016-07-11
| |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| | * | | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 21:55:55 +0000