Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #2800 from ctiller/reduce-mac-load | Nicolas Noble | 2015-08-06 |
|\ | | | | | Reduce mac load on Jenkins | ||
* \ | Merge pull request #2750 from ctiller/propagate | Yang Gao | 2015-08-06 |
|\ \ | | | | | | | Core-supported context propagation | ||
* \ \ | Merge pull request #2396 from nicolasnoble/win32-is-an-os-too | Craig Tiller | 2015-08-05 |
|\ \ \ | | | | | | | | | Calling python to spawn a python subprocess. | ||
* \ \ \ | Merge pull request #2781 from yang-g/stuboptions | Abhishek Kumar | 2015-08-05 |
|\ \ \ \ | | | | | | | | | | | Add StubOptions | ||
| | | | * | Merge branch 'propagate' into reduce-mac-load | Craig Tiller | 2015-08-05 |
| | | | |\ | | | | |/ | | | |/| | |||
* | | | | | Merge pull request #2801 from ctiller/shrinkify-the-bytes | Nicolas Noble | 2015-08-05 |
|\ \ \ \ \ | | | | | | | | | | | | | Initial Doxygen import for core, c++ | ||
| | | | * \ | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | |||
* | | | | | | Merge pull request #2656 from yang-g/reconnect_branch_based_on_jitter | Vijay Pai | 2015-08-05 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Connection backoff interop test client and server | ||
* \ \ \ \ \ \ | Merge pull request #2713 from ctiller/plucking-hell | Vijay Pai | 2015-08-05 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Allow specific pollers to be woken | ||
| | | | * \ \ \ | Merge remote-tracking branch 'upstream/master' into stuboptions | yang-g | 2015-08-05 |
| | | | |\ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||
| | * | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | yang-g | 2015-08-05 |
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | reconnect_branch_based_on_jitter | ||
| | | * | | | | | Initial Doxygen import for core, c++ | Craig Tiller | 2015-08-05 |
| |_|/ / / / / |/| | | | | | | |||
| | | | | | * | Merge branch 'propagate' into reduce-mac-load | Craig Tiller | 2015-08-05 |
| | | | | | |\ | | | | | | |/ | | | | | |/| | |||
| | | | | * | | Merge github.com:grpc/grpc into propagate | Craig Tiller | 2015-08-05 |
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | | | |||
| | | | | | * | Fix typo | Craig Tiller | 2015-08-05 |
| | | | | | | | |||
| | | | | | * | Add linux, mac as test platforms, only run _with_poll tests on linux | Craig Tiller | 2015-08-05 |
| | | | | |/ | |||
| | | | * | | Merge branch 'master' of github.com:grpc/grpc into win32-is-an-os-too | Nicolas "Pixel" Noble | 2015-08-05 |
| | | | |\ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | Conflicts: tools/buildgen/generate_projects.py | ||
* | | | | | | Merge pull request #2748 from soltanmm/whats-up-doc | Nicolas Noble | 2015-08-04 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Addenda to tools readme | ||
* \ \ \ \ \ \ | Merge pull request #2346 from jboeuf/upgrade-openssl-1.0.2d | Nicolas Noble | 2015-08-04 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Upgrading to OpenSSL 1.0.2d | ||
* \ \ \ \ \ \ \ | Merge pull request #2757 from jtattermusch/runtest_polishing | Craig Tiller | 2015-08-04 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Runtest polishing | ||
* | | | | | | | | | add HealthCheck tests to run_tests.py | Jan Tattermusch | 2015-08-04 |
| | | | | | | | | | |||
| | | | * | | | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-04 |
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | |||
| | | | | | | | * | Add proxy tests to end2end suite | Craig Tiller | 2015-08-04 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the oauth2 variant of these tests is disabled. Will work with @jboeuf to figure out how to turn them on. | ||
| | | | | | * | | | Add StubOptions | yang-g | 2015-08-03 |
| | | | | | | | | | |||
* | | | | | | | | | Adding a sanity check that the cached makefile variables aren't committed. | Nicolas "Pixel" Noble | 2015-08-04 |
| |_|_|_|_|/ / / |/| | | | | | | | |||
| | | | | * | | | merge with head and resolve conflicts | yang-g | 2015-08-03 |
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #2737 from jtattermusch/enable_new_interop_tests | Stanley Cheung | 2015-08-03 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Enable oauth2_auth_token and per_rpc_creds interop tests for C# | ||
| | * | | | | | | polishing runtests | Jan Tattermusch | 2015-08-01 |
| |/ / / / / / |/| | | | | | | |||
| | | | * | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-08-01 |
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
* | | | | | | | Merge pull request #2717 from ctiller/yeah-we-know-what-youre-talking-about | Yang Gao | 2015-07-31 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Make call_create with host=NULL provide a default host name | ||
| | | | * | | | | Addenda to tools readme | Masood Malekghassemi | 2015-07-31 |
| | | | | | | | | |||
* | | | | | | | | Use py.test from run_tests.py | Masood Malekghassemi | 2015-07-31 |
| |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also updates the version of grpcio_test. Now that grpcio and its tests are in different project packages, the version numbers should be kept in sync. | ||
* | | | | | | | Merge pull request #2698 from soltanmm/reorganize-python | Nathaniel Manista | 2015-07-31 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Reorganize src/python. | ||
* \ \ \ \ \ \ \ | Merge pull request #2663 from jcanizales/run-test-server-locally | Michael Lumish | 2015-07-31 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Run test server locally | ||
| | | * \ \ \ \ \ | Merge github.com:grpc/grpc into yeah-we-know-what-youre-talking-about | Craig Tiller | 2015-07-31 |
| | | |\ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: vsprojects/Grpc.mak vsprojects/grpc.sln vsprojects/grpc/grpc.vcxproj vsprojects/grpc_cpp_plugin/grpc_cpp_plugin.vcxproj vsprojects/grpc_csharp_ext/grpc_csharp_ext.vcxproj vsprojects/grpc_csharp_plugin/grpc_csharp_plugin.vcxproj vsprojects/grpc_objective_c_plugin/grpc_objective_c_plugin.vcxproj vsprojects/grpc_python_plugin/grpc_python_plugin.vcxproj vsprojects/grpc_ruby_plugin/grpc_ruby_plugin.vcxproj vsprojects/grpc_unsecure/grpc_unsecure.vcxproj | ||
| | | | * | | | | | enable oauth2_auth_token and per_rpc_creds interop tests for C# | Jan Tattermusch | 2015-07-31 |
| |_|_|/ / / / / |/| | | | | | | | |||
| * | | | | | | | Make plugin & server, and pod install via run_tests.py | Jorge Canizales | 2015-07-30 |
| | | | | | | | | |||
| * | | | | | | | Start integrating ObjC tests in run_tests.py | Jorge Canizales | 2015-07-30 |
| | | | | | | | | |||
| | * | | | | | | Reorganize Python tests | Masood Malekghassemi | 2015-07-30 |
| | | | | | | | | |||
| | * | | | | | | Reorganize Python packages | Masood Malekghassemi | 2015-07-30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is in preparation of moving all tests into a separate package to enable ease of coverage checking and testing. | ||
| | | | | * | | | Merge github.com:grpc/grpc into plucking-hell | Craig Tiller | 2015-07-30 |
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #2723 from a-veitch/issue_2710 | Michael Lumish | 2015-07-30 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Move grpc_census_call_*_context calls into public header | ||
| | | | | * | | | Merge branch 'regen-and-vs-tweaks' of github.com:nicolasnoble/grpc into ↵ | Craig Tiller | 2015-07-30 |
| | | | | |\ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | tepid-tarantula | ||
| | | | | | * | | merge with head | yang-g | 2015-07-30 |
| | | | | | |\ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||
* | | | | | | | | Merge pull request #2697 from soltanmm/add-sphinx-doc | Nathaniel Manista | 2015-07-30 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Python documentation generation. | ||
* \ \ \ \ \ \ \ \ | Merge pull request #2590 from yang-g/jitter | Vijay Pai | 2015-07-30 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Reconnect with jitter. | ||
| | | * | | | | | | | merge with master, fix build issue | Alistair Veitch | 2015-07-30 |
| | | | | | | | | | | |||
| | | * | | | | | | | Merge branch 'master' into issue_2709 | Alistair Veitch | 2015-07-30 |
| | | |\ \ \ \ \ \ \ | |||
* | | | | | | | | | | | Make ruby tests see changes to C core | murgatroid99 | 2015-07-30 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||
| | | * | | | | | | | Move grpc_census_call_*_context calls into public header | Alistair Veitch | 2015-07-30 |
| | | | | | | | | | |