aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Fix merge errorsGravatar Craig Tiller2016-12-27
|
* Fix merge errorsGravatar Craig Tiller2016-12-27
|
* Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-12-27
|\
| * Merge pull request #9178 from jtattermusch/docker_inception_is_evilGravatar Jan Tattermusch2016-12-23
| |\ | | | | | | Cleanup and speedup sanity tests
| * \ Merge pull request #9190 from matt-kwong/fix-python-artifactGravatar matt-kwong2016-12-22
| |\ \ | | | | | | | | Fix Python artifact build
| * \ \ Merge pull request #9193 from matt-kwong/interop-html-fixGravatar matt-kwong2016-12-22
| |\ \ \ | | | | | | | | | | Update interop html template location
| | * | | Update interop html template locationGravatar Matt Kwong2016-12-22
| |/ / /
| | * | Fix Python artifact buildGravatar Matt Kwong2016-12-22
| | | |
| * | | Merge pull request #8668 from lenage/masterGravatar apolcyn2016-12-22
| |\ \ \ | | | | | | | | | | Ruby: show error class and message instead of unknown
| | | | * cleanup and speedup of sanity testsGravatar Jan Tattermusch2016-12-22
| | |_|/ | |/| |
| * | | Merge pull request #9176 from jtattermusch/runtests_refactorGravatar Jan Tattermusch2016-12-22
| |\ \ \ | | | | | | | | | | Clean up tools/run_tests directory
| | * | | cleanup tools/run_tests directoryGravatar Jan Tattermusch2016-12-22
| |/ / /
| * | | Merge pull request #9184 from jtattermusch/qps_driver_cmdlineGravatar Jan Tattermusch2016-12-22
| |\ \ \ | | |_|/ | |/| | Better qps_json_driver message when QPS_WORKERS env is missing
| | | * take tmp out of .gitignore fileGravatar Yuan He2016-12-22
| | | |
| | | * Ruby: show error class and message instead of unknownGravatar Yuan He2016-12-22
| | |/ | |/|
| * | Merge pull request #9180 from soltanmm-google/lodash_becomes-midashGravatar Masood Malekghassemi2016-12-21
| |\ \ | | | | | | | | Change grpcio_tools to grpcio-tools
| | | * better qps_json_driver message when QPS_WORKERS env is missingGravatar Jan Tattermusch2016-12-21
| | |/ | |/|
| * | Merge pull request #9168 from apolcyn/allow_disable_qps_json_driver_core_countsGravatar apolcyn2016-12-20
| |\ \ | | | | | | | | allow disable core_list setting and override qps server in benchmarks
| | * | allow disable core_list setting and override qps server in benchmarksGravatar Alexander Polcyn2016-12-20
| |/ /
| * | Merge pull request #9174 from jtattermusch/matrix_exclude_filtersGravatar Jan Tattermusch2016-12-20
| |\ \ | | | | | | | | Support --exclude in run_tests_matrix.py
| | | * Change grpcio_tools to grpcio-toolsGravatar Masood Malekghassemi2016-12-20
| | |/ | |/| | | | | | | | | | This should address the difference in how we ask users to install grpcio-tools and the files the user ends up downloading from PyPI.
| | * support --exclude in run_tests_matrix.pyGravatar Jan Tattermusch2016-12-20
| |/
| * Merge pull request #9158 from jtattermusch/deflaking_adjustmentsGravatar Jan Tattermusch2016-12-20
| |\ | | | | | | Allow running many runs per test without flooding the logs
| * \ Merge pull request #9161 from jtattermusch/reenable_timeoutsGravatar Jan Tattermusch2016-12-20
| |\ \ | | | | | | | | Reintroduce test timeouts eliminated by mistake
| * \ \ Merge pull request #9164 from y-zeng/secure_endpoint_fdGravatar Yuchen Zeng2016-12-19
| |\ \ \ | | | | | | | | | | Get wrapped endpoint's fd in secure_endpoint's endpoint_get_fd
| * \ \ \ Merge pull request #9143 from sreecha/fix_metrics_serverGravatar David G. Quintas2016-12-19
| |\ \ \ \ | | | | | | | | | | | | Fix metrics server
| * \ \ \ \ Merge pull request #9145 from nathanielmanistaatgoogle/v1.0.x-upmergeGravatar Nicolas Noble2016-12-19
| |\ \ \ \ \ | | | | | | | | | | | | | | v1.0.x manual upmerge
| | | | * | | Get wrapped endpoint's fd in secure_endpoint's endpoint_get_fdGravatar Yuchen Zeng2016-12-19
| | |_|/ / / | |/| | | |
| * | | | | Merge pull request #9097 from ncteisen/negative_http2_interop_testsGravatar Noah Eisen2016-12-19
| |\ \ \ \ \ | | | | | | | | | | | | | | Add Python Client to Test Negative HTTP2 Conditions
| | * | | | | Add python client to test negative http2 conditionsGravatar ncteisen2016-12-19
| |/ / / / / | | | | | | | | | | | | | | | | | | Documentation for the new tests can be found https://github.com/grpc/grpc/blob/master/doc/negative-http2-interop-test-descriptions.md
| | | | | * enable running many runs per test without flooding the logsGravatar Jan Tattermusch2016-12-19
| | | | |/
| | | | * test timeouts eliminated by mistakeGravatar Jan Tattermusch2016-12-19
| | | | |
| * | | | Merge pull request #9144 from dgquintas/grpclb_server_uriGravatar David G. Quintas2016-12-16
| |\ \ \ \ | | | | | | | | | | | | grpclb: skip slash in server uri path if present
| * \ \ \ \ Merge pull request #9128 from ncteisen/negative_http2_interop_descriptionsGravatar Noah Eisen2016-12-16
| |\ \ \ \ \ | | | | | | | | | | | | | | Add negative http2 interop description file
| | * | | | | Update negative-http2-interop-test-descriptions.mdGravatar Noah Eisen2016-12-16
| | | | | | |
| | | | * | | v1.0.x → master upmergeGravatar Nathaniel Manista2016-12-16
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual changes: - Fixed use of Exception.message in _invalid_metadata_test.py - Fixed merge of one_failed_as_unavailable in rpc_server_spec.rb - Added "set -e" to generate_build_additions.sh
| | * | | | | | Addressed github commentsGravatar Noah Eisen2016-12-16
| | | | | | | |
| | | * | | | | grpclb: skip slash in server uri path if presentGravatar David Garcia Quintas2016-12-16
| | | | |_|_|/ | | | |/| | |
| * | | | | | Merge pull request #9126 from ericgribkoff/http2_test_case_flagsGravatar Eric Gribkoff2016-12-16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Modify HTTP/2 test server's command-line arguments
| * \ \ \ \ \ \ Merge pull request #9100 from bblancha/protobuf_compiler_tweakGravatar Masood Malekghassemi2016-12-16
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | don't print multiple imports to protobuf modules
| | | | | | | * Fix metrics serverGravatar Sree Kuchibhotla2016-12-16
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #8789 from y-zeng/resolver_pollsetGravatar Yuchen Zeng2016-12-16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add grpc_pollset_set to grpc_resolve_address
| * \ \ \ \ \ \ Merge pull request #9138 from dgquintas/lb_pol_test_deflake_againGravatar David G. Quintas2016-12-16
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | Deflake lb_policies_test
| | | | * | | | don't print multiple imports to protobuf modulesGravatar Bryan Blanchard2016-12-15
| | | | | | | |
| | * | | | | | Deflake lb_policies_testGravatar David Garcia Quintas2016-12-15
| |/ / / / / /
| * | | | | | Merge pull request #9101 from murgatroid99/node_event_changesGravatar Michael Lumish2016-12-15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Make event order consistent, and make 'end' and 'error' mutually exclusive
| * \ \ \ \ \ \ Merge pull request #9131 from ncteisen/fix_copyrightGravatar makdharma2016-12-15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add copyright to new files
| | * | | | | | | Add copywrite to new filesGravatar ncteisen2016-12-15
| |/ / / / / / /
| * | | | | | | Merge pull request #9034 from igorpeshansky/patch-1Gravatar Michael Lumish2016-12-15
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use snake_case names for default rpc method implementations
| | | | | | | * | Add negative http2 interop description fileGravatar Noah Eisen2016-12-15
| | | | | | | | |