Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into cq_alarm | David Garcia Quintas | 2015-10-07 |
|\ | |||
| * | Merge pull request #3725 from jtattermusch/win_jenkins_adjustments | Craig Tiller | 2015-10-07 |
| |\ | | | | | | | Increase timeout for build step jobs to 10 mins | ||
| | * | increase timeout for build step jobs to 10 mins | Jan Tattermusch | 2015-10-07 |
| | | | |||
| * | | Merge pull request #3558 from murgatroid99/node_auth_plugin | Tim Emiola | 2015-10-07 |
| |\ \ | | | | | | | | | Add Node Auth plugin code | ||
| * \ \ | Merge pull request #3709 from jtattermusch/win_jenkins_adjustments | Craig Tiller | 2015-10-07 |
| |\ \ \ | | | |/ | | |/| | Reduce parallelism for windows build | ||
| | * | | reduce parallelism for windows build | Jan Tattermusch | 2015-10-07 |
| | | | | |||
| | | * | Resolved merge conflicts | murgatroid99 | 2015-10-07 |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Added more documentation to credentials.js | murgatroid99 | 2015-10-07 |
| | | | | |||
| * | | | Merge pull request #3685 from bjori/master | Stanley Cheung | 2015-10-07 |
| |\ \ \ | | | | | | | | | | | Fix #2275 (Make sure PHP example can be run with Apache) | ||
| * \ \ \ | Merge pull request #3672 from murgatroid99/node_package_cleanup | Tim Emiola | 2015-10-07 |
| |\ \ \ \ | | | | | | | | | | | | | Node package cleanup | ||
| | * \ \ \ | Resolved merge conflicts | murgatroid99 | 2015-10-07 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | | * | Resolved merge conflicts | murgatroid99 | 2015-10-07 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | Merge pull request #3625 from murgatroid99/node_single_install_step | Tim Emiola | 2015-10-07 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Node single install step | ||
| | | | | | * | Removed now-extaneous function | murgatroid99 | 2015-10-07 |
| | | | | | | | |||
| * | | | | | | Merge pull request #3700 from ctiller/kill_build_json | David G. Quintas | 2015-10-07 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | build.json reappeared | ||
| * \ \ \ \ \ \ | Merge pull request #3697 from grpc/release-0_11 | Nicolas Noble | 2015-10-07 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | release-0_11 -> master integration | ||
| * | | | | | | | Merge pull request #3647 from ctiller/smash-it | Nicolas Noble | 2015-10-07 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix connectivity tests under Windows | ||
| | | | * | | | | | build.json reappeared | Craig Tiller | 2015-10-07 |
| | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #3677 from ctiller/port_server_be_flaky | Nicolas Noble | 2015-10-07 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | More robust port_server version checking | ||
| * \ \ \ \ \ \ \ | Merge pull request #3638 from soltanmm/pip-so-cash | Nicolas Noble | 2015-10-07 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Enable `pip` caching | ||
| | | | | | | | | * | Resolved merge conflicts | murgatroid99 | 2015-10-07 |
| | | | | | | | | |\ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #3695 from rjshade/udp_exec_ctx | Yang Gao | 2015-10-07 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix broken udp_server_test, by adding exec_ctx to read_cb | ||
| | | | | | * \ \ \ \ | Merge pull request #3696 from nathanielmanistaatgoogle/grpc-in-3-minutes-python | LisaFC | 2015-10-07 |
| | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | "gRPC in 3 minutes" for Python | ||
| | | | | | | * | | | | | "gRPC in 3 minutes" for Python | Nathaniel Manista | 2015-10-07 |
| | | | | | |/ / / / / | |||
| | * | | | / / / / / | Fix broken udp_server_test, by adding exec_ctx to read_cb | Robbie Shade | 2015-10-07 |
| |/ / / / / / / / / | |||
| * | | | | | | | | | Merge pull request #3099 from murgatroid99/node_interop_echo_metadata | Jan Tattermusch | 2015-10-06 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Node interop custom_metadata | ||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #3683 from soltanmm/verbosity | Nathaniel Manista | 2015-10-06 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add verbosity to Python `run_tests.py` output. | ||
| | | * | | | | | | | | | Fixed issues with binary metadata type checking | murgatroid99 | 2015-10-06 |
| | | | | | | | | | | | | |||
| | * | | | | | | | | | | Set pytest-xdist-compatible pytest-timeout method | Masood Malekghassemi | 2015-10-06 |
| | | | | | | | | | | | | |||
| | | | | | | | | | * | | Fix #2275 (Make sure PHP example can be run with Apache) | Hannes Magnusson | 2015-10-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normal constants, like most other things, are cleaned up during RSHUTDOWN. We need to explicitly mark them as persistent using CONST_PERSISTENT | ||
| * | | | | | | | | | | | Merge pull request #3679 from yang-g/flake3 | Vijay Pai | 2015-10-06 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | unref slice before cancel | ||
| | | * | | | | | | | | | Add verbosity back to Python testing output | Masood Malekghassemi | 2015-10-06 |
| | |/ / / / / / / / / | |/| | | | | | | | | | |||
| | | * | | | | | | | | Merge branch 'master' into node_interop_echo_metadata | murgatroid99 | 2015-10-06 |
| | | |\ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | unref slice before cancel | yang-g | 2015-10-06 |
| | | | | | | | | | | | | |||
| * | | | | | | | | | | | Merge pull request #3615 from dgquintas/gcc_520 | Vijay Pai | 2015-10-06 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | Type conversion fixes to make GCC 5.2.0 happy | ||
| * | | | | | | | | | | | Merge pull request #3610 from ctiller/stressy | Vijay Pai | 2015-10-06 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix thread stuck problem on Mac | ||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #3675 from jtattermusch/interop_auth_tests | Jan Tattermusch | 2015-10-06 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add auth interop test support to run_interop_tests.py | ||
| | | | | | | | * | | | | | | More robust port_server version checking | Craig Tiller | 2015-10-06 |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge pull request #3676 from jtattermusch/add_ruby_server | Jan Tattermusch | 2015-10-06 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ruby server to run_interop_tests.py | ||
| | | | * | | | | | | | | | | Add commentary | Craig Tiller | 2015-10-06 |
| | | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | add ruby server to run_interop_tests.py | Jan Tattermusch | 2015-10-06 |
| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Merge pull request #3645 from grpc/release-0_11 | Nicolas Noble | 2015-10-06 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | / / / / | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | Upport changes from 0.11 release branch. | ||
| | | | | | | | * | | | | | Enable pip caching on Jenkins slaves | Masood Malekghassemi | 2015-10-06 |
| | | | | | | | | | | | | | |||
| | | | | * | | | | | | | | Add commentary | Craig Tiller | 2015-10-06 |
| | | | | | | | | | | | | | |||
| | | | | * | | | | | | | | clang-format | Craig Tiller | 2015-10-06 |
| | | | | | | | | | | | | | |||
| | | | | * | | | | | | | | ex --> ext | Craig Tiller | 2015-10-06 |
| | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | add auth interop tests | Jan Tattermusch | 2015-10-06 |
| | | | | | | | | | | | | | |||
| | | | | | | | | | | | * | Resolved merge conflicts with master | murgatroid99 | 2015-10-06 |
| | | | | | | | | | | | |\ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||
| | | | | | * | | | | | | | Simplified comments | David Garcia Quintas | 2015-10-06 |
| | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | Don't package tests in Node package | murgatroid99 | 2015-10-06 |
| | | | | | | | | | | | | |