aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
Commit message (Collapse)AuthorAge
* 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 #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 #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
| | * | | | | 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 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
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #7553 from podsvirov/topic-cmake-templateGravatar Nicolas Noble2016-07-29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | CMake Project Improvements
| * \ \ \ \ \ \ \ 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
| | * | | | | | | update to use new nuget client in testsGravatar Alexander Polcyn2016-07-28
| | | | | | | | |
| | | * | | | | | CMake: Installation and Export ConfigurationGravatar Konstantin Podsvirov2016-07-28
| | |/ / / / / / | |/| | | | | |
| | * | | | | | 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 pull request #7508 from murgatroid99/v1.0.x_merge_into_masterGravatar Nicolas Noble2016-07-25
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | V1.0.x merge into master
| * \ \ \ \ \ \ \ \ Merge pull request #7451 from y-zeng/seperate_generated_filesGravatar kpayson642016-07-25
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf
| | | | * | | | | | | fix copyrightGravatar Stanley Cheung2016-07-25
| | | | | | | | | | |
| * | | | | | | | | | Merge pull request #7395 from markdroth/handshake_apiGravatar kpayson642016-07-25
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | General-purpose handshaker API.
| | | | * | | | | | | | Fix merge againGravatar murgatroid992016-07-25
| | | | | | | | | | | |
| | | | | * | | | | | | php: add php7 to jenkins basic and interop testsGravatar Stanley Cheung2016-07-23
| | | | | | | | | | | |
| | | | | * | | | | | | php: remove protobuf-php clone hackGravatar Stanley Cheung2016-07-22
| | | | | | | | | | | |
| | | | | * | | | | | | remove outdated php dockerfile dependencyGravatar Stanley Cheung2016-07-22
| | |_|_|/ / / / / / / | |/| | | | | | | | |
| | | | * | | | | | | Fixed incorrect mergesGravatar murgatroid992016-07-22
| | | | | | | | | | |
| | | | * | | | | | | Actually commit changes to tools/distrib/python/grpcio_tools/setup.pyGravatar murgatroid992016-07-22
| | | | | | | | | | |
| | | | * | | | | | | Merge v1.0.x into masterGravatar murgatroid992016-07-22
| | |_|/| | | | | | | | |/| | |/ / / / / /
| | | | | | | * | | merge to upstream/masterGravatar Alistair Veitch2016-07-21
| | | | | | | |\ \ \
| * | | | | | | \ \ \ Merge pull request #7269 from y-zeng/cli_callGravatar kpayson642016-07-21
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | Support server reflection in CLI
| | | | | * | | | | | Merge pull request #7491 from kpayson64/remote_linux_whl_artifactsGravatar kpayson642016-07-21
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove non-manylinux linux .whl artifacts
| | | | * | \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into seperate_generated_filesGravatar Yuchen Zeng2016-07-21
| | | | |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | | | | * | | | | | | Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fixGravatar Nicolas "Pixel" Noble2016-07-21
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/run_tests/run_tests.py
| | | | | | | * | | | | | Remove non-manylinux linux .whl artifactsGravatar Ken Payson2016-07-21
| | | | | | | | | | | | |
| | | | | | * | | | | | | Merge pull request #7462 from ctiller/backport-delayed-writeGravatar Nicolas Noble2016-07-21
| | | | | | |\ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | | Backport delayed write into v1.0.x branch
| * | | | | | | | | | | | Merge pull request #7465 from grpc/revert-6942-perf_html_reportGravatar kpayson642016-07-21
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Generate html report for perf tests"
| | | | | | | | | | * \ \ \ Merge remote-tracking branch 'upstream/master' into filter_call_init_failureGravatar Mark D. Roth2016-07-21
| | | | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | |
| | | | | | | * | | | | | | Merge pull request #7484 from soltanmm/docgen-improGravatar kpayson642016-07-21
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade virtualenv pip in Python docgen
| | | | | | | | * | | | | | | Upgrade virtualenv pip in Python docgenGravatar Masood Malekghassemi2016-07-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ignore the docgen-generated directories under doc/.
| | | | | | | * | | | | | | | Correct shell scripting mistake in node package generation codeGravatar murgatroid992016-07-20
| | | | | | | |/ / / / / / /
| | | | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_apiGravatar Mark D. Roth2016-07-20
| | | | |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |