aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* get timeouts working on run_tests.py againGravatar Craig Tiller2016-07-13
|
* Better fine-tuningGravatar Craig Tiller2016-07-12
|
* Get json_run_localhost working againGravatar Craig Tiller2016-07-12
|
* Get json_run_localhost working againGravatar Craig Tiller2016-07-12
|
* Actually run json_run_localhost testsGravatar Craig Tiller2016-07-12
|
* Better error messageGravatar Craig Tiller2016-07-12
|
* Make request freelists per cq, to allow drastically higher requested call countsGravatar Craig Tiller2016-07-12
|
* Ensure timely response to marksGravatar Craig Tiller2016-07-12
|
* Merge github.com:grpc/grpc into delayed-writeGravatar Craig Tiller2016-07-12
|\
* | Fix rare flakeGravatar Craig Tiller2016-07-12
| |
* | Fix regex filteringGravatar Craig Tiller2016-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.
| | | * | | 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
| | | |\ \ \ \ \ \
| * | | \ \ \ \ \ \ Merge pull request #7297 from dgquintas/compression_cookbookGravatar Nicolas Noble2016-07-11
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | Compression Cookbook
| * | | | | | | | | Merge pull request #7312 from kpayson64/fix_sanityGravatar kpayson642016-07-11
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | Updated composer.json template
* | | | | | | | | | Merge github.com:grpc/grpc into delayed-writeGravatar Craig Tiller2016-07-11
|\| | | | | | | | |
| | * | | | | | | | Updated composer.json.templateGravatar Ken Payson2016-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
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #7288 from makdharma/protobuf_import_issue7219Gravatar makdharma2016-07-11
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #7259
| * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7307 from kpayson64/port_server_timeoutGravatar kpayson642016-07-11
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | Added timeout to port server
| | * | | | | | | | | | | Added timeout to port serverGravatar Ken Payson2016-07-09
| |/ / / / / / / / / / /
| | | | | | | * / / / / Compression CookbookGravatar David Garcia Quintas2016-07-08
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| | | | | * | | | | | another oneGravatar yang-g2016-07-08
| | | | | | | | | | |
| | | | | * | | | | | Merge remote-tracking branch 'upstream/master' into importGravatar yang-g2016-07-08
| | | | | |\ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #7274 from murgatroid99/ruby_api_review_changesGravatar kpayson642016-07-08
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Split incoming initial and trailing metadata in Ruby calls
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #7160 from nathanielmanistaatgoogle/handlers-optionalGravatar kpayson642016-07-08
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Make handlers optional at server construction
| | | | * | | | | | | | | removed unneeded import. fixes travis buildGravatar Makarand Dharmapurikar2016-07-08
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #7195 from soltanmm/winfixGravatar kpayson642016-07-08
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Python interop unit-tests on Windows