aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge github.com:grpc/grpc into mooveeGravatar Craig Tiller2016-08-09
|\
| * Merge pull request #7680 from muxi/fix-objc-jenkins-testGravatar makdharma2016-08-09
| |\ | | | | | | Extend the deadline of objc-examples-build to 30 minutes
| * \ Merge pull request #7677 from HuKeping/caseGravatar Nicolas Noble2016-08-09
| |\ \ | | | | | | | | Use DBC case instead of SBC case
| * \ \ Merge pull request #7678 from fr05t1k/masterGravatar Vijay Pai2016-08-09
| |\ \ \ | | | | | | | | | | Doc fix
| | | | * Extend the deadline of objc-examples-build to 30 minutesGravatar Muxi Yan2016-08-09
| | | | |
| * | | | Merge pull request #7128 from daniel-j-born/server_clone_fixGravatar Nicolas Noble2016-08-09
| |\ \ \ \ | | | | | | | | | | | | Set siblings for server clones properly.
| * \ \ \ \ Merge pull request #7676 from vjpai/chttp2_allocation_reductionGravatar Vijay Pai2016-08-09
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Remove an unnecessary error allocation from chttp2
| | | | * | Update README.mdGravatar Stanislav2016-08-09
| | |_|/ / | |/| | |
| | | | * Use DBC case instead of SBC caseGravatar HuKeping2016-08-09
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Hu Keping <hukeping@huawei.com>
| | * | clang-formatGravatar Vijay Pai2016-08-08
| | | |
| | * | Proxy for @ghemawat: Removed an unnecessary error allocation from chttp2 code.Gravatar Vijay Pai2016-08-09
| |/ /
| * | Merge pull request #6915 from markdroth/filter_apiGravatar kpayson642016-08-05
| |\ \ | | | | | | | | Implement C++ API for defining channel filters.
| * \ \ Merge pull request #7625 from thunderboltsid/python-test-fixGravatar kpayson642016-08-05
| |\ \ \ | | | | | | | | | | Fix the ThreadPoolExecutor: max_workers can't be 0 in _channel_connectivity_test and _channel_ready_future_test
| * \ \ \ Merge pull request #7653 from nicolasnoble/fix-interop-goGravatar Nicolas Noble2016-08-05
| |\ \ \ \ | | | | | | | | | | | | Hopefully fixing #7639.
| | * | | | Reducing diff.Gravatar Nicolas "Pixel" Noble2016-08-05
| | | | | |
| | * | | | That won't work properly. Falling back on fixing the list of dependencies.Gravatar Nicolas "Pixel" Noble2016-08-05
| | | | | |
| | * | | | Using the interop dependencies instead.Gravatar Nicolas "Pixel" Noble2016-08-05
| | | | | |
| | * | | | Hopefully fixing #7639.Gravatar Nicolas "Pixel" Noble2016-08-05
| |/ / / /
| * | | | Merge pull request #7447 from nicolasnoble/interop_server_splitGravatar Nicolas Noble2016-08-04
| |\ \ \ \ | | | | | | | | | | | | Splitting out interop's server helper.
| | * | | | Forgot one fileGravatar Nicolas "Pixel" Noble2016-08-04
| | | | | |
| | * | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-08-04
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #7626 from nicolasnoble/manual-upmerge-after-version-bumpGravatar Nicolas Noble2016-08-03
| |\ \ \ \ \ | | | | | | | | | | | | | | Manual upmerge after version bump.
| | | | * | | Fix the ThreadPoolExecutor: max_workers can't be 0Gravatar siddharthshukla2016-08-03
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a RecordingThreadPool that inherits from Executor, contains a ThreadPoolExecutor and has an extra method 'was_used' to indicate if submit method was ever called i.e. if the thread pool was ever used.
| | * | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpcGravatar Nicolas "Pixel" Noble2016-08-03
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt Makefile build.yaml package.json 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/health_check/package.json src/node/tools/package.json src/python/grpcio/grpc_version.py src/python/grpcio_health_checking/grpc_version.py src/python/grpcio_tests/grpc_version.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb 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
| | | | * | clang-formatGravatar Mark D. Roth2016-08-03
| | | | | |
| * | | | | Merge pull request #5803 from nicolasnoble/what-the-fuzzGravatar Nicolas Noble2016-08-03
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixing json parsing issues detected by libfuzz.
| | | * \ \ \ Merge pull request #7572 from ↵Gravatar Jorge Canizales2016-08-03
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jcanizales/p0-4MB-should-be-more-than-enough-for-everybody Let override default response size limit
| * | | \ \ \ \ Merge pull request #7619 from dgquintas/fix_grpclbtestGravatar kpayson642016-08-03
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | deflake grpclb_test
| | * | | | | | | regenerated projectsGravatar David Garcia Quintas2016-08-03
| | | | | | | | |
| | * | | | | | | deflake grpclb_testGravatar David Garcia Quintas2016-08-02
| | | | | | | | |
| * | | | | | | | Merge pull request #7554 from muxi/fix-cronet-interop-testGravatar Muxi Yan2016-08-02
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fix Objective-C test pods for Cronet tests
| * | | | | | | | Merge pull request #7370 from rjshade/move_timeout_encodingGravatar kpayson642016-08-02
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Move timeout_encoding to core/lib/transport
| * \ \ \ \ \ \ \ \ Merge pull request #7254 from nicolasnoble/gcloud-no-image-aliasesGravatar Nicolas Noble2016-08-02
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Stop using image aliases, as this is getting deprecated.
| | | | | | * \ \ \ \ Merge pull request #7618 from dgquintas/v1.0.xGravatar Nicolas Noble2016-08-02
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Backport of "added windows to INSTALL.md"
| | | | | | | * | | | | Merge pull request #7587 from dgquintas/install_docsGravatar Nicolas Noble2016-08-02
| | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | added windows to INSTALL.md
| * | | | | | | | | | Merge pull request #7587 from dgquintas/install_docsGravatar Nicolas Noble2016-08-02
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | added windows to INSTALL.md
| | * | | | | | | | | | corrected typoGravatar David Garcia Quintas2016-08-02
| | | | | | | | | | | |
| | | | | | | | | | * | Update destroy_call_elem args from merge.Gravatar Mark D. Roth2016-08-02
| | | | | | | | | | | |
| | | | | | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into what-the-fuzzGravatar Nicolas "Pixel" Noble2016-08-02
| | | | | | |\ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge pull request #7520 from thunderboltsid/update-gitignoreGravatar Nicolas Noble2016-08-02
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Update .gitignore to include .idea folder
| * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7522 from makdharma/enable_secure_endpoint_traceGravatar Nicolas Noble2016-08-02
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed hardcoded disable on logging
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7600 from dgquintas/fix_includesGravatar Nicolas Noble2016-08-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed include guard script and faulty .h
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6774 from a-veitch/add_resourceGravatar kpayson642016-08-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Census resource API and implementation.
| | | | | | | | | | | * \ \ \ \ Merge pull request #7610 from kpayson64/downgrade_setuptoolsGravatar kpayson642016-08-02
| | | | | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downgrade docker setuptools
| * | | | | | | | | | | \ \ \ \ \ Merge pull request #7024 from markdroth/filter_call_init_failureGravatar kpayson642016-08-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend filter API to allow call initialization to return an error.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7601 from dgquintas/census_stuffGravatar kpayson642016-08-02
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed census static metadata keys for tracing and tag propagation
| | | | | | | | | | | | | | * | | | | Downgrade docker setuptoolsGravatar Ken Payson2016-08-02
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | | | | | * | Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | | | | | | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Fix destroy_call_elem API in test.Gravatar Mark D. Roth2016-08-02
| | | | | | | | | | | | | | | | | | |