Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2017-01-03 |
|\ | |||
| * | Merge pull request #9132 from nathanielmanistaatgoogle/python-examples | Nathaniel Manista | 2016-12-29 |
| |\ | | | | | | | Update Python examples with fresh generated code. | ||
| | * | Exempt generated Python from copyright check | Nathaniel Manista | 2016-12-29 |
| | | | | | | | | | | | | | | | Some of these files contain the magic string "DO NOT EDIT" but we do not wish for our tests to depend upon that. | ||
| * | | Provide doc dir even if user interrupts docgen | Masood Malekghassemi | 2016-12-27 |
| | | | |||
* | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-27 |
|\| | | |||
| * | | Merge pull request #9178 from jtattermusch/docker_inception_is_evil | Jan Tattermusch | 2016-12-23 |
| |\ \ | | | | | | | | | Cleanup and speedup sanity tests | ||
| * \ \ | Merge pull request #9190 from matt-kwong/fix-python-artifact | matt-kwong | 2016-12-22 |
| |\ \ \ | | | | | | | | | | | Fix Python artifact build | ||
| * | | | | Update interop html template location | Matt Kwong | 2016-12-22 |
| | | | | | |||
| | * | | | Fix Python artifact build | Matt Kwong | 2016-12-22 |
| | | | | | |||
| | | * | | cleanup and speedup of sanity tests | Jan Tattermusch | 2016-12-22 |
| | |/ / | |/| | | |||
| * | | | cleanup tools/run_tests directory | Jan Tattermusch | 2016-12-22 |
| |/ / | |||
| * | | Merge pull request #9180 from soltanmm-google/lodash_becomes-midash | Masood Malekghassemi | 2016-12-21 |
| |\ \ | | | | | | | | | Change grpcio_tools to grpcio-tools | ||
| | * | | Change grpcio_tools to grpcio-tools | Masood Malekghassemi | 2016-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.py | Jan Tattermusch | 2016-12-20 |
| |/ / | |||
| * | | Merge pull request #9158 from jtattermusch/deflaking_adjustments | Jan Tattermusch | 2016-12-20 |
| |\ \ | | | | | | | | | Allow running many runs per test without flooding the logs | ||
| * \ \ | Merge pull request #9161 from jtattermusch/reenable_timeouts | Jan Tattermusch | 2016-12-20 |
| |\ \ \ | | | | | | | | | | | Reintroduce test timeouts eliminated by mistake | ||
| | | * | | enable running many runs per test without flooding the logs | Jan Tattermusch | 2016-12-19 |
| | |/ / | |||
| | * / | test timeouts eliminated by mistake | Jan Tattermusch | 2016-12-19 |
| | |/ | |||
| * | | v1.0.x → master upmerge | Nathaniel Manista | 2016-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 | ||
* | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-15 |
|\| | | |||
| * | | Merge pull request #9109 from jtattermusch/protoc_artifacts_fix | Jan Tattermusch | 2016-12-15 |
| |\ \ | | | | | | | | | Fix building protoc artifacts on linux | ||
| | | * | Upversion Python | Masood Malekghassemi | 2016-12-14 |
| | | | | |||
| | | * | Patch overlooked strings from Python un-namespacing | Masood Malekghassemi | 2016-12-14 |
| | | | | |||
| * | | | Patch overlooked strings from Python un-namespacing | Masood Malekghassemi | 2016-12-14 |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-14 |
|\| | | | |||
| | * | | fix building protoc artifacts on linux | Jan Tattermusch | 2016-12-14 |
| |/ / | |||
| | * | Up-version Python | Masood Malekghassemi | 2016-12-12 |
| | | | |||
| | * | Un-namespace Python packages | Masood Malekghassemi | 2016-12-12 |
| | | | | | | | | | | | | | | | Setuptools was updated and our hacky namespace-package-chickens came back to roost. This removes the unsupported namespace package hacks. | ||
| * | | Un-namespace Python packages | Masood Malekghassemi | 2016-12-12 |
| | | | | | | | | | | | | | | | Setuptools was updated and our hacky namespace-package-chickens came back to roost. This removes the unsupported namespace package hacks. | ||
* | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
|\| | | |||
| * | | Merge pull request #9062 from grpc/revert-9019-short_deadlines | Craig Tiller | 2016-12-12 |
| |\ \ | | | | | | | | | Revert "Handle (and test) short call deadlines" | ||
| * | | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | Craig Tiller | 2016-12-12 |
| | | | | |||
| | * | | Revert "Handle (and test) short call deadlines" | Craig Tiller | 2016-12-12 |
| |/ / | |||
* | | | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
|\| | | |||
| * | | Merge pull request #9026 from jtattermusch/protobuf_consistent_cmake | Jan Tattermusch | 2016-12-12 |
| |\ \ | | | | | | | | | Make cmake protobuf building consistent with third_party/protobuf | ||
| | | * | Merge pull request #9051 from ↵ | Masood Malekghassemi | 2016-12-09 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | soltanmm-google/I-used-to-hate-history-class,then-I-learned-for-myself-that-so-long-as-we're-all-human-we-will-make-the-same-human-mistakes-again-and-again-and-that's-worth-studying Backport Python setuptools unpinning | ||
| | | * \ | Merge pull request #9044 from ncteisen/go_docker_fix_backport | Noah Eisen | 2016-12-09 |
| | | |\ \ | | | | | | | | | | | | | Fix Go Docker Backport | ||
| | | | | * | Backport Python setuptools unpinning | Masood Malekghassemi | 2016-12-09 |
| | | | |/ | | | |/| | | | | | | | | | | | This should allow our tests to build on newer virtualenvs. | ||
| | | | * | Fix go docker | Noah Eisen | 2016-12-09 |
| | | | | | |||
| | | * | | Up-version Python for backports | Masood Malekghassemi | 2016-12-09 |
| | | |/ | |||
| * | | | Short deadlines: set Status on deadline | David Garcia Quintas | 2016-12-09 |
| | | | | |||
| * | | | Merge remote-tracking branch 'upstream/master' into ↵ | Mark D. Roth | 2016-12-09 |
| |\ \ \ | | | | | | | | | | | | | | | | revert-8949-revert-8922-slice_cleanup | ||
* | \ \ \ | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-09 |
|\ \ \ \ \ | |||
| | | * | | | readable output from run_tests.py on windows | Jan Tattermusch | 2016-12-09 |
| | |/ / / | |/| | | | |||
| | | * | | make protobuf building consistent | Jan Tattermusch | 2016-12-09 |
| | |/ / | |/| | | |||
| * | | | Merge pull request #8699 from apolcyn/run_perf_on_benchmarks | apolcyn | 2016-12-08 |
| |\ \ \ | | | | | | | | | | | Add perf option to benchmark runner script, create text profiles and flamegraphs | ||
| | * | | | add a "perf" option to benchmarks script, generate profile text reports and ↵ | Alexander Polcyn | 2016-12-08 |
| | | | | | | | | | | | | | | | | | | | | flamegraphs | ||
| * | | | | Merge pull request #8969 from apolcyn/fix_netperf_quit_job_timeout | apolcyn | 2016-12-08 |
| |\ \ \ \ | | | | | | | | | | | | | handle empty string for qps workers in driver and dont quit them after netperf test | ||
| * \ \ \ \ | Merge pull request #8966 from soltanmm-google/this-is-okay | Masood Malekghassemi | 2016-12-07 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix #8285 | ||
| | * | | | | | Unpin Python setuptools dependency | Masood Malekghassemi | 2016-12-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8285, allows us to work on later versions of virtualenv without getting problems with too-recent python packaging versions. |