Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-27 |
|\ | |||
| * | Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfile | kpayson64 | 2016-07-25 |
| |\ | | | | | | | PHP: add PHP7 to various Jenkins tests and update dockerfile | ||
* | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\| | | | | | | | | | | | | | | Conflicts: Makefile | ||
| * | | Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master | Nicolas Noble | 2016-07-25 |
| |\ \ | | | | | | | | | V1.0.x merge into master | ||
| * \ \ | Merge pull request #7451 from y-zeng/seperate_generated_files | kpayson64 | 2016-07-25 |
| |\ \ \ | | | | | | | | | | | Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf | ||
| | | | * | fix copyright | Stanley Cheung | 2016-07-25 |
| | | | | | |||
* | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split | Nicolas "Pixel" Noble | 2016-07-25 |
|\| | | | | |||
| * | | | | Merge pull request #7395 from markdroth/handshake_api | kpayson64 | 2016-07-25 |
| |\ \ \ \ | | | | | | | | | | | | | General-purpose handshaker API. | ||
| | | | * | | Fix merge again | murgatroid99 | 2016-07-25 |
| | | | | | | |||
| | | | | * | php: add php7 to jenkins basic and interop tests | Stanley Cheung | 2016-07-23 |
| | | | | | | |||
| | | | | * | php: remove protobuf-php clone hack | Stanley Cheung | 2016-07-22 |
| | | | | | | |||
| | | | | * | remove outdated php dockerfile dependency | Stanley Cheung | 2016-07-22 |
| | |_|_|/ | |/| | | | |||
| | | | * | Fixed incorrect merges | murgatroid99 | 2016-07-22 |
| | | | | | |||
| | | | * | Actually commit changes to tools/distrib/python/grpcio_tools/setup.py | murgatroid99 | 2016-07-22 |
| | | | | | |||
| | | | * | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
| | |_|/| | |/| | | | |||
| * | | | | Merge pull request #7269 from y-zeng/cli_call | kpayson64 | 2016-07-21 |
| |\ \ \ \ | | | | | | | | | | | | | Support server reflection in CLI | ||
| | | | | * | Merge pull request #7491 from kpayson64/remote_linux_whl_artifacts | kpayson64 | 2016-07-21 |
| | | | | |\ | | | | | | | | | | | | | | | Remove non-manylinux linux .whl artifacts | ||
| | | | * | \ | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-21 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | | | | * | | Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fix | Nicolas "Pixel" Noble | 2016-07-21 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tools/run_tests/run_tests.py | ||
| | | | | | | * | Remove non-manylinux linux .whl artifacts | Ken Payson | 2016-07-21 |
| | | | | | | | | |||
| | | | | | * | | Merge pull request #7462 from ctiller/backport-delayed-write | Nicolas Noble | 2016-07-21 |
| | | | | | |\ \ | | | | | | | |/ | | | | | | |/| | Backport delayed write into v1.0.x branch | ||
| * | | | | | | | Merge pull request #7465 from grpc/revert-6942-perf_html_report | kpayson64 | 2016-07-21 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Revert "Generate html report for perf tests" | ||
| | | | | | | * \ | Merge pull request #7484 from soltanmm/docgen-impro | kpayson64 | 2016-07-21 |
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Upgrade virtualenv pip in Python docgen | ||
| | | | | | | | * | | Upgrade virtualenv pip in Python docgen | Masood Malekghassemi | 2016-07-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also ignore the docgen-generated directories under doc/. | ||
| | | | | | | * | | | Correct shell scripting mistake in node package generation code | murgatroid99 | 2016-07-20 |
| | | | | | | |/ / | |||
| | | | * | | | | | Merge remote-tracking branch 'upstream/master' into handshake_api | Mark D. Roth | 2016-07-20 |
| | | | |\ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||
| | | | | * | | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_files | Yuchen Zeng | 2016-07-19 |
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||
| | | | | | | * | | Merge pull request #7397 from soltanmm/hua-tulyada-hua-wa-hua-HEY-Hey-hey-hey | kpayson64 | 2016-07-19 |
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | Document the custom grpcio-tools command class | ||
| | | | | | | * \ \ | Merge pull request #7424 from soltanmm/macverfix | kpayson64 | 2016-07-19 |
| | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | Force the Python host version on Mac OS X | ||
| | | | | | | | | * | | Document the custom grpcio-tools command class | Masood Malekghassemi | 2016-07-19 |
| | | | | | | | | | | | |||
| * | | | | | | | | | | Merge pull request #7431 from thinkerou/fix_spell_error | kpayson64 | 2016-07-19 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Python: fix spell error by pyflakes found | ||
| * | | | | | | | | | | | Add latency profiling from 'important' marks | Craig Tiller | 2016-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows seeing directly how long was spent: - running up to putting bytes on the wire - between sending and receiving - between receiving and finishing | ||
| | | | | | * | | | | | | Fix sanity check | Yuchen Zeng | 2016-07-19 |
| | | | | | | | | | | | | |||
| | | * | | | | | | | | | Revert "Generate html report for perf tests" | Vijay Pai | 2016-07-19 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||
| | | | | | | | | | * | Merge pull request #6737 from ctiller/delayed-write | Craig Tiller | 2016-07-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay beginning most writes until we enter poll() | ||
| | | | | | | | * | | | Force the Python host version on Mac OS X | Masood Malekghassemi | 2016-07-18 |
| | | | | | | | | |/ | | | | | | | | |/| | |||
* | | | | | | | / | | Splitting interop_server.cc | Nicolas "Pixel" Noble | 2016-07-18 |
|/ / / / / / / / / | |||
| | | | * / / / / | Separate generated file and protobuf dependency | Yuchen Zeng | 2016-07-18 |
| |_|_|/ / / / / |/| | | | | | | | |||
| | | | | * | | | Polish grpcio_health_checking package | Ken Payson | 2016-07-18 |
| | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Rename namespace to grpc_health->grpc to match spec -Proper use of NOT_FOUND status code -Improve testing -Add source distribution to artifact build | ||
| | | | | * | | Merge pull request #7416 from soltanmm/3D | kpayson64 | 2016-07-18 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | Build Python distributions for Python 3 | ||
* | | | | | \ \ | Merge pull request #6942 from adelez/perf_html_report | kpayson64 | 2016-07-18 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Generate html report for perf tests | ||
| | | | | * | | | | Make default log verbosity ERROR, run tests with DEBUG | Craig Tiller | 2016-07-18 |
| | | | | | |_|/ | | | | | |/| | | |||
| | * | | / | | | fix spell error by pyflakes found | thinkerou | 2016-07-17 |
| |/ / / / / / |/| | | | | | | |||
| | | | | | * | Support long paths in make_grpcio_tools.py | Masood Malekghassemi | 2016-07-16 |
| | | | | | | | |||
| | | | | | * | Use normalized path separators in `setup.py`s | Masood Malekghassemi | 2016-07-16 |
| | | | | | | | |||
| | | | | | * | Change directory when building grpcio-tools | Masood Malekghassemi | 2016-07-16 |
| | | | | | | | |||
| | | | | | * | Increase build timeouts for Python artifacts | Masood Malekghassemi | 2016-07-16 |
| | | | | | | | |||
| | | | | | * | Build Python distributions for Python 3 | Masood Malekghassemi | 2016-07-16 |
| | | | | | | | |||
| | | | | | * | Allow make_grpcio_tools.py to be invoked in parallel | Masood Malekghassemi | 2016-07-16 |
| | | | | |/ | | | | |/| | |||
| | | | | * | Install virtualenv in Python distribtest Dockerfiles | Masood Malekghassemi | 2016-07-15 |
| | | | |/ |