Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #9857 from murgatroid99/merge_1.1.x_master | Michael Lumish | 2017-02-27 |
|\ | | | | | Upmerge 1.1.x into master | ||
* \ | Merge pull request #9747 from ctiller/splitsies | Craig Tiller | 2017-02-24 |
|\ \ | | | | | | | Increase timeout for bm_fullstack | ||
| | * | Merge remote-tracking branch 'upstream/v1.1.x' into merge_1.1.x_master | murgatroid99 | 2017-02-23 |
| |/| |/| | | |||
* | | | Merge pull request #9694 from nicolasnoble/upmerge_from_1_1_x | Michael Lumish | 2017-02-23 |
|\ \ \ | | | | | | | | | Upmerge from 1.1.x | ||
| | | * | Merge pull request #9766 from murgatroid99/node_uv_testing | Michael Lumish | 2017-02-22 |
| | | |\ | | | | | | | | | | | Improve Node and libuv testing and test coverage | ||
| | * | | | Exclude poll, poll-cv for bm_fullstack (its not interesting) | Craig Tiller | 2017-02-22 |
| | | | | | |||
| | | | * | Improve Node and libuv testing and test coverage | murgatroid99 | 2017-02-17 |
| | | | | | | | | | | | | | | | | | | | | Allow Node tests to run with or without UV, change default version to 7, add some portability tests. Also make some more core tests work with libuv | ||
| | * | | | Increase timeout for bm_fullstack | Craig Tiller | 2017-02-16 |
| |/ / / |/| | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into packet-coalescing-core | Muxi Yan | 2017-02-14 |
|\ \ \ \ | |||
| | * | | | Merge remote-tracking branch 'google/v1.1.x' | Nicolas "Pixel" Noble | 2017-02-13 |
| |/| | | | | |/ / | |||
| * | | | Merge pull request #9665 from jtattermusch/cmake_csharp_extension | Jan Tattermusch | 2017-02-10 |
| |\ \ \ | | | | | | | | | | | Use grpc_csharp_ext built by cmake | ||
| * \ \ \ | Merge pull request #9599 from ppietrasa/feature-PDBs | Jan Tattermusch | 2017-02-10 |
| |\ \ \ \ | | | | | | | | | | | | | Fix issue #9597 | ||
| | | * | | | use grpc_csharp_ext built by cmake | Jan Tattermusch | 2017-02-09 |
| | |/ / / | |/| | | | |||
| * | | | | Advance protoc podspec template version to 3.1.0 as well | Muxi Yan | 2017-02-09 |
| | | | | | |||
| | | * | | build fixes for ruby on mac | Alexander Polcyn | 2017-02-09 |
| | | |/ | |||
| | * | | Cosmetics (removed one newline) | Piotr Pietraszkiewicz | 2017-02-09 |
| | | | | |||
| | | * | Merge remote-tracking branch 'upstream/v1.1.x' into node_disable_libuv_core | murgatroid99 | 2017-02-07 |
| | | |\ | |||
| * | | \ | Merge pull request #9596 from muxi/cronet-tests-in-jenkins | Muxi Yan | 2017-02-07 |
| |\ \ \ \ | | | | | | | | | | | | | Add Cronet core tests to Jenkins | ||
| | | | * | | Disable libuv core changes in Node library | murgatroid99 | 2017-02-06 |
| | | | | | | |||
| | * | | | | Add Cronet core tests to Jenkins | Muxi Yan | 2017-02-06 |
| | | | | | | |||
| | | | | * | Merge remote-tracking branch 'upstream/v1.1.x' into ↵ | Muxi Yan | 2017-02-06 |
| | | | | |\ | | | | | |/ | | | | |/| | | | | | | | automate-objc-version-advancement-v1.1.x | ||
| * | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Muxi Yan | 2017-02-06 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | automate-objc-version-advancement | ||
* | | | | | | | nit fixes | Muxi Yan | 2017-02-06 |
| | | | | | | | |||
| | * | | | | | Merge pull request #9574 from stanley-cheung/php-update-gen-code-examples | Stanley Cheung | 2017-02-06 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | PHP: update README and apache/nginx examples | ||
| | | | | * | | | Fix issue #9597 | Piotr Pietraszkiewicz | 2017-02-06 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate consistently named PDBs for libraries across generators and install those PDBs if present. | ||
| | * | | | | | | Merge pull request #9534 from muxi/port-9505 | Muxi Yan | 2017-02-06 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | Port #9505: Fixes for gRPC ObjC v1.1.0 release | ||
| | * | | | | | | Merge pull request #9511 from ctiller/assert_writes | Craig Tiller | 2017-02-04 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | Add a test verifying number of writes per RPC is reasonable | ||
| * | | | | | | | Correct commet style of version.h | Muxi Yan | 2017-02-04 |
| | | | | | | | | |||
| | | | | | | * | Correct commet style of version.h | Muxi Yan | 2017-02-04 |
| | | | | | | | | |||
| | | * | | | | | Merge branch 'bwest' into assert_writes | Craig Tiller | 2017-02-03 |
| | | |\ \ \ \ \ | |||
| | | | * | | | | | Speed up bm_fullstack test | Craig Tiller | 2017-02-03 |
| | | | | | | | | | |||
| | * | | | | | | | Put files in a better place | Craig Tiller | 2017-02-03 |
| | | | | | | | | | |||
| | | | | | | | * | Add regeneration info to version.h | Muxi Yan | 2017-02-03 |
| | | | | | | | | | |||
| * | | | | | | | | Add regeneration info to version.h | Muxi Yan | 2017-02-03 |
| | | | | | | | | | |||
| | | | | | * | | | PHP: update README and apache/nginx examples | Stanley Cheung | 2017-02-03 |
| | | | |_|/ / / | | | |/| | | | | |||
| | * / | | | | | Add some debug utilities | Craig Tiller | 2017-02-03 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This PR adds a set of debug helpers that are intended for calling only from gdb. They cross abstraction boundaries and allow quickly accessing one thing from another thing. I expect to grow this library significantly over time to aid debugging tricky problems. | ||
| | | | | * | | Merge pull request #9553 from apolcyn/fix_ruby_mac_build | apolcyn | 2017-02-03 |
| | | | | |\ \ | | | | | | | | | | | | | | | | | ruby bundle install work around to build packages on mac | ||
| | * | | | | | | cmake: fix #8729 | Jan Tattermusch | 2017-02-02 |
| | | | | | | | | |||
| | * | | | | | | cmake: support static runtime linking | Jan Tattermusch | 2017-02-02 |
| | | | | | | | | |||
| | * | | | | | | boringssl silences its own warnings | Jan Tattermusch | 2017-02-02 |
| | | | | | | | | |||
| | * | | | | | | build grpc_csharp_ext as shared | Jan Tattermusch | 2017-02-02 |
| | |/ / / / / | |||
| | | | | * | | update dependency in template | Alexander Polcyn | 2017-02-02 |
| | | | | | | | |||
| | * | | | | | Merge pull request #9456 from jtattermusch/cmake_convenience_targets | Jan Tattermusch | 2017-02-02 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Big improvements to CMake build | ||
| | * \ \ \ \ \ | Merge pull request #9519 from jtattermusch/csharp_test_doubles | Jan Tattermusch | 2017-02-02 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add a way to create testing doubles for C# calls. | ||
| | * \ \ \ \ \ \ | Merge pull request #9535 from stanley-cheung/php-update-examples | Stanley Cheung | 2017-02-01 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | PHP: update examples | ||
| | | | * | | | | | | add C# testing APIs | Jan Tattermusch | 2017-02-01 |
| | | |/ / / / / / | | |/| | | | | | | |||
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into packet-coalescing-core | Muxi Yan | 2017-02-01 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Dynamically enable packet coalescing by channel args | Muxi Yan | 2017-02-01 |
| | | | | | | | | | |||
| | | | * | | | | | add convenience cmake targets | Jan Tattermusch | 2017-02-02 |
| | |_|/ / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #9364 from rjshade/sanitizer_slowdown | Yang Gao | 2017-01-31 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Replaces macros with methods for test timeout scaling |