aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
Commit message (Collapse)AuthorAge
* Merge github.com:grpc/grpc into mooveeGravatar Craig Tiller2016-08-09
|\
| * Extend the deadline of objc-examples-build to 30 minutesGravatar Muxi Yan2016-08-09
| |
| * Merge pull request #6915 from markdroth/filter_apiGravatar kpayson642016-08-05
| |\ | | | | | | Implement C++ API for defining channel filters.
| * | 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 branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-08-04
| |\ \
| | * \ 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 #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 remote-tracking branch 'upstream/master' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | 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 Jenkins test errorGravatar Muxi Yan2016-08-02
| | | | | | | | | | | | |
| | | | | | | | | | | | * Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-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 branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-08-02
| |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * \ \ 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
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Merge pull request #7602 from kpayson64/downgrade_setuptools.pyGravatar kpayson642016-08-01
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Downgrade docker setuptools
| | | * | | | | | | | | | | | Downgrade docker setuptoolsGravatar Ken Payson2016-08-01
| | | | |_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | Changed census static metadata keys for tracing and tag propagationGravatar David Garcia Quintas2016-08-01
| | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | | | | | | * | | | | | fixed include guard script and faulty .hGravatar David Garcia Quintas2016-08-01
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16Gravatar David Garcia Quintas2016-08-01
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / | | | |/| | | | | | | | |
| | | | | * | | | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
| | | | | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
| | | | | | | | | | | * | build everythingGravatar Jan Tattermusch2016-07-31
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge pull request #7553 from podsvirov/topic-cmake-templateGravatar Nicolas Noble2016-07-29
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake Project Improvements
| | | | | | | | | | | * | | Bumping to 1.0.0-pre2.Gravatar Nicolas "Pixel" Noble2016-07-29
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Merge branch 'v1.0.x' into manual-upmergeGravatar Nicolas "Pixel" Noble2016-07-29
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ruby/pb/test/client.rb src/ruby/pb/test/server.rb tools/dockerfile/test/php7_jessie_x64/Dockerfile
| | | | | | | | | | | * | | Merge pull request #7567 from murgatroid99/node_artifact_build_health_checkGravatar Nicolas Noble2016-07-29
| | | | | |_|_|_|_|_|/| | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | Build the Node health-check package in the build_packages script
| | | | * | | | | | | | | | update to use new nuget client in testsGravatar Alexander Polcyn2016-07-28
| | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | | | | | | | | | | * | Build the Node health-check package in the build_packages scriptGravatar murgatroid992016-07-28
| | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | | * | | | | | | CMake: Installation and Export ConfigurationGravatar Konstantin Podsvirov2016-07-28
| | | | |/ / / / / / / | | | |/| | | | | | |
| * | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-07-27
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | | * | | | | | | regenerate from templateGravatar Stanley Cheung2016-07-26
| | | | | | | | | | |
| | | | * | | | | | | fix copyrightGravatar Stanley Cheung2016-07-26
| | | | | | | | | | |
| | | | * | | | | | | php: add php7 to jenkins basic and interop testsGravatar Stanley Cheung2016-07-26
| | | | | | | | | | |
| | | | * | | | | | | php: remove protobuf-php clone hackGravatar Stanley Cheung2016-07-26
| | | | | | | | | | |
| | | | * | | | | | | remove outdated php dockerfile dependencyGravatar Stanley Cheung2016-07-26
| | | | | | | | | | |
| | | | | | | | | * | Merge branch 'master' into move_timeout_encodingGravatar Robbie Shade2016-07-26
| | | | | | | | | |\ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfileGravatar kpayson642016-07-25
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | PHP: add PHP7 to various Jenkins tests and update dockerfile
| * | | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-07-25
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile
| | * | | | | | | | | | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_masterGravatar Nicolas Noble2016-07-25
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | V1.0.x merge into master
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 13:13:43 +0000