aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* 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.
| * | 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
* | | 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
| | | | | | | | |
| | | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into what-the-fuzzGravatar Nicolas "Pixel" Noble2016-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
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Fix destroy_call_elem API in test.Gravatar Mark D. Roth2016-08-02
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge pull request #7590 from vjpai/affinity_optionalGravatar Vijay Pai2016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't assert if we're not able to set CPU affinity
| | | | | | | | | | | * | | | | | Fix Jenkins test errorGravatar Muxi Yan2016-08-02
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Ran generate_projects.sh.Gravatar Mark D. Roth2016-08-02
| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failureGravatar Mark D. Roth2016-08-02
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #7603 from vitalybuka/stack-use-after-scopeGravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | Fix stack-use-after-scope in call.c
* | | | | | | | | | | | | | | | | | Merge pull request #6924 from dgquintas/grpclb_v0Gravatar kpayson642016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gRPC LB policy
| | | | | | | | | | | | | | | | | | * Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-08-02
| | | | | | | | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7575 from vjpai/make_stack_small_againGravatar Vijay Pai2016-08-02
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shrink a stack-allocated array to avoid giant frame
| | | | | | | | | | | | | | | | * \ \ \ Merge pull request #7580 from jtattermusch/netcore_nuget_to_rtmGravatar Jan Tattermusch2016-08-02
| | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | |/ / / | | | | | | | | | | | | | | | | |/| | | Update .NET core dependencies to RTM
| | * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Fix stack use after scope in call.cGravatar Vitaly Buka2016-08-01
| |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AddressSanitizer detects stack-use-after-scope bug. This means that variable was used at a point when compiler assume that it's dead. Here compression_md lifetime is limited by switch scope. However implementation of execute_op blow access it outside the scope.
* | | | | | | | | | | | | | | | | | | Merge pull request #7602 from kpayson64/downgrade_setuptools.pyGravatar kpayson642016-08-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downgrade docker setuptools
| * | | | | | | | | | | | | | | | | | | Downgrade docker setuptoolsGravatar Ken Payson2016-08-01
| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | moar clang-formatGravatar David Garcia Quintas2016-08-01
| | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | Changed census static metadata keys for tracing and tag propagationGravatar David Garcia Quintas2016-08-01
| |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | regenerated projectsGravatar David Garcia Quintas2016-08-01
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #7391 from dgquintas/lr_july_16Gravatar Nicolas Noble2016-08-01
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Load Reporting Filter
| | | | | | | | * | | | | | | | | | | | fixed include guard script and faulty .hGravatar David Garcia Quintas2016-08-01
| |_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | Bug fix on error suppression and commentGravatar Muxi Yan2016-08-01
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | clang-formatGravatar David Garcia Quintas2016-08-01
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16Gravatar David Garcia Quintas2016-08-01
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | fixed premature destruction of lb_clientGravatar David Garcia Quintas2016-08-01
| | | | | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | | | | Suppress warning in all libraries whose names starting with gRPC-CoreGravatar Muxi Yan2016-08-01
| | | | | | | | | | | | | | | | | | |