Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #8419 from murgatroid99/node_express_benchmark | Michael Lumish | 2016-10-27 |
|\ | | | | | Add benchmark client and server for Node Express | ||
* \ | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-19 |
|\ \ | |||
| | * | Create benchmark client and server for Node Express | murgatroid99 | 2016-10-18 |
| | | | |||
| * | | Merge pull request #7664 from kpayson64/cv_wakeup_fd | kpayson64 | 2016-10-17 |
| |\ \ | | |/ | |/| | Add Shim for wakeup_fds with no pipe or | ||
* | | | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-14 |
|\| | | |||
* | | | Add libuv tests, and installation step in dockerfile | murgatroid99 | 2016-10-12 |
| | | | |||
| * | | more flexible test naming in reports | Jan Tattermusch | 2016-10-12 |
| | | | |||
| | * | Add condition variable polling engine | kpayson64 | 2016-10-10 |
| |/ | |||
* | | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-07 |
|\| | |||
* | | UV tests pass on linux | murgatroid99 | 2016-10-07 |
| | | |||
| * | dont eat run_tests.py errors on test failure | Jan Tattermusch | 2016-10-07 |
| | | |||
* | | Merge branch 'master' into uv_core_transport | murgatroid99 | 2016-10-03 |
|\| | |||
* | | Compile and link core tests with libuv | murgatroid99 | 2016-10-03 |
| | | |||
| * | Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under | Nicolas "Pixel" Noble | 2016-09-29 |
|/| | |||
* | | Merge pull request #7893 from thunderboltsid/remove_shutdown_legacy_server | Nathaniel Manista | 2016-09-20 |
|\ \ | | | | | | | Remove erroneously redefined function from run_tests.py. | ||
| | * | update path to C# test build by dotnet cli | Jan Tattermusch | 2016-09-15 |
| | | | |||
| * | | remove erroneously redefined function from run_tests.py | Siddharth Shukla | 2016-09-09 |
| | | | | | | | | | | | | The function was added in 824c234de8cc0b9a7e4cfd6618060e4158ecf8e3. | ||
| | * | Add 'node6' to the other spot where it's needed in run_tests.py | murgatroid99 | 2016-09-08 |
| | | | |||
* | | | update path to C# test build by dotnet cli | Jan Tattermusch | 2016-09-08 |
| | | | |||
* | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-09-08 |
|\ \ \ | |/ / |/| / | |/ | |||
| * | Add Node 6 to the list of recognized compilers in run_tests.py | murgatroid99 | 2016-09-06 |
| | | |||
* | | Merge pull request #7633 from thunderboltsid/add-pypy-to-testing-toolchain | kpayson64 | 2016-08-15 |
|\ \ | | | | | | | add PyPy to testing toolchain | ||
* \ \ | Merge branch 'v1.0.x' into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-11 |
|\ \ \ | | |/ | |/| | |||
* | | | Extend the deadline of objc-examples-build to 30 minutes | Muxi Yan | 2016-08-09 |
| | | | |||
| | * | add PyPy to testing toolchain | siddharthshukla | 2016-08-04 |
| |/ |/| | |||
| * | Merge commit '5e623b8d8d8d106bd4ab9a6d77ef43b1a134d8ec' into ↵ | Jorge Canizales | 2016-07-29 |
| |\ | | | | | | | | | | p0-advance-protobuf-version | ||
| * | | nit: format ObjC test targets better | Jorge Canizales | 2016-07-29 |
| | | | | | | | | | So they can be commented out. | ||
| | * | php: add php7 to jenkins basic and interop tests | Stanley Cheung | 2016-07-26 |
| | | | |||
* | | | Merge pull request #7512 from stanley-cheung/php-cleanup-dockerfile | kpayson64 | 2016-07-25 |
|\ \ \ | | | | | | | | | PHP: add PHP7 to various Jenkins tests and update dockerfile | ||
| * | | | php: add php7 to jenkins basic and interop tests | Stanley Cheung | 2016-07-23 |
| | | | | |||
* | | | | Merge v1.0.x into master | murgatroid99 | 2016-07-22 |
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||
| * | | 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 | ||
| | * | | Merge pull request #6737 from ctiller/delayed-write | Craig Tiller | 2016-07-19 |
| | |/ | | | | | | | | | | Delay beginning most writes until we enter poll() | ||
| * / | Make default log verbosity ERROR, run tests with DEBUG | Craig Tiller | 2016-07-18 |
| |/ | |||
* | | Merge github.com:grpc/grpc into delayed-write | Craig Tiller | 2016-07-13 |
|\ \ | |||
| * \ | Merge pull request #7265 from thunderboltsid/issue-7094-retry | Nicolas Noble | 2016-07-13 |
| |\ \ | | | | | | | | | Retrying: Make the testing scripts executable on Python 3.x | ||
| * \ \ | Merge pull request #7112 from thunderboltsid/issue-7110 | Nicolas Noble | 2016-07-13 |
| |\ \ \ | | |_|/ | |/| | | Add dockerfile for pyenv and modify run_tests.py to include py35 and py36 | ||
| * | | | Merge pull request #7359 from jcanizales/p0-protoc-podspec | makdharma | 2016-07-13 |
| |\ \ \ | | | | | | | | | | | Distribute ProtoC and the plugin as pods | ||
* | | | | | get timeouts working on run_tests.py again | Craig Tiller | 2016-07-13 |
| | | | | | |||
* | | | | | Merge github.com:grpc/grpc into delayed-write | Craig Tiller | 2016-07-12 |
|\| | | | | |||
* | | | | | Fix regex filtering | Craig Tiller | 2016-07-12 |
| | | | | | |||
| * | | | | Addressing comments. | Nicolas "Pixel" Noble | 2016-07-12 |
| | | | | | |||
| * | | | | Merge branch 'release-0_15' into upmerge-master | Nicolas "Pixel" Noble | 2016-07-12 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile build.yaml gRPC-Core.podspec gRPC.podspec package.json package.xml 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/tools/package.json src/python/grpcio/grpc/__init__.py src/python/grpcio/grpc_version.py src/python/grpcio_tests/tests/unit/_rpc_test.py src/ruby/lib/grpc/version.rb src/ruby/tools/version.rb templates/gRPC.podspec.template 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 tools/run_tests/port_server.py | ||
| | | | | * | Make testing toolchain python 3.x compliant | siddharthshukla | 2016-07-12 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | six is necessary for making these scripts cross compatible between python 2.x and 3.x Changes: Add six to python_deps.include Include python_deps.include to all Dockerfile templates in test directory Include python_deps.include to all Dockerfile templates in stress_test directory Include python_deps.include to all Dockerfile templates in interop_test directory Replace print statements with print function calls (from futute..) Replace .iteritems() with .items() wherever necessary use six.moves to import BaseHTTPServer Generate new dockerfiles using generate_projects.sh | ||
| | | * | | Merge master to resolve tests podspec conflict | Jorge Canizales | 2016-07-11 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Enable py35 and py36 testing | siddharthshukla | 2016-07-11 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Add dockerfile template for python_pyenv_x64 docker image Generate the dockerfile using generate_projects.sh Modify run_tests.py to include python3.5 and python3.6 Runs python_jessie_x64 for python versions 2.7 and 3.4, and python_pyenv_x64 for python versions 3.5 and 3.6 | ||
* | | | | Merge github.com:grpc/grpc into delayed-write | Craig Tiller | 2016-07-11 |
|\| | | | |||
| | | * | Podspecs for Protoc and the gRPC plugin | Jorge Canizales | 2016-07-11 |
| | | | | | | | | | | | | | | | | | | | | The examples under <repo_root>/examples now rely on the released versions. Those under src/objective-c/examples, as well as the tests, rely on protoc and the plugin as compiled from head. | ||
| * | | | Added timeout to port server | Ken Payson | 2016-07-09 |
| | | | | |||
| * | | | Make Python tests run on Windows | Masood Malekghassemi | 2016-07-08 |
| | | | |