Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-30 |
|\ | |||
| * | Merge pull request #6020 from grpc/revert-5963-csharp_refactor_building | Jan Tattermusch | 2016-03-30 |
| |\ | |||
| * \ | Merge pull request #6022 from grpc/revert-5933-sockaddr_resolver_lb | Jan Tattermusch | 2016-03-30 |
| |\ \ | |||
| | * | | Revert "added grpclb support to sockaddr resolver" | Craig Tiller | 2016-03-30 |
| |/ / | |||
| * | | Merge pull request #6014 from nicolasnoble/manual-upmerge | Jan Tattermusch | 2016-03-30 |
| |\ \ | |||
* | | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-30 |
|\| | | | |||
| | | * | Revert "Refactor C# building in run_tests.py" | Jan Tattermusch | 2016-03-30 |
| | |/ | |/| | |||
| * | | Merge pull request #5933 from dgquintas/sockaddr_resolver_lb | Jan Tattermusch | 2016-03-30 |
| |\ \ | |||
| * \ \ | Merge pull request #5950 from dgquintas/lb_policies_new_interface | Jan Tattermusch | 2016-03-30 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #5978 from dgquintas/channel_args_docs | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #5997 from vjpai/i_know_async | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #5963 from jtattermusch/csharp_refactor_building | Stanley Cheung | 2016-03-29 |
| |\ \ \ \ \ \ | |||
| | | | | | | * | Merge branch 'release-0_13' into manual-upmerge | Nicolas "Pixel" Noble | 2016-03-30 |
| | |_|_|_|_|/| | |/| | | | | | | |||
| | | | | | | * | Merge pull request #6004 from nicolasnoble/backport-of-5735 | Nicolas Noble | 2016-03-29 |
| | | | | | | |\ | |||
| | | | | | | | * | Better memory management for grpc_rb_byte_buffer_to_s. | Nicolas "Pixel" Noble | 2016-03-30 |
| | | | | | | | * | Fix Ruby memory leaks | Zhuochun | 2016-03-30 |
| | | | | | | |/ | |||
| * | | | | | | | Merge pull request #6003 from ctiller/uhoh | Craig Tiller | 2016-03-29 |
| |\ \ \ \ \ \ \ | |||
| | * | | | | | | | Trim number of CPUs | Craig Tiller | 2016-03-29 |
| |/ / / / / / / | |||
| * | | | | | | | Merge pull request #5976 from earhart/master | Nicolas Noble | 2016-03-29 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge pull request #5979 from ctiller/gource | Nicolas Noble | 2016-03-29 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge pull request #5846 from ctiller/fuzzy-bits | Nicolas Noble | 2016-03-29 |
| |\ \ \ \ \ \ \ \ \ | |||
| | | | * | | | | | | | Add protobuf_clib to deps of grpc++_codegen_lib | Rob Earhart | 2016-03-29 |
| | | | * | | | | | | | Fix the Bazel build re/nanopb | Rob Earhart | 2016-03-29 |
| | |_|/ / / / / / / | |/| | | | | | | | | |||
| | * | | | | | | | | Fix codegen | Craig Tiller | 2016-03-29 |
| | * | | | | | | | | Merge github.com:grpc/grpc into fuzzy-bits | Craig Tiller | 2016-03-29 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||
| * | | | | | | | | | Merge pull request #5736 from pquerna/pq/is_wan_is_ios_only | Jan Tattermusch | 2016-03-29 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #5971 from sreecha/stress_test_flexible_config | Jan Tattermusch | 2016-03-29 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #5904 from jtattermusch/csharp_perf_intergrate | Jan Tattermusch | 2016-03-29 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | | | | Used TYPED_TEST to parametrize | Vijay Pai | 2016-03-29 |
| | | | | | | | * | | | | | clang-format | Vijay Pai | 2016-03-29 |
| | | | | | | | * | | | | | Add a concurrent test for sync client, async server case | Vijay Pai | 2016-03-29 |
* | | | | | | | | | | | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-28 |
|\| | | | | | | | | | | | | |||
| | | | | * | | | | | | | | Fix include | Craig Tiller | 2016-03-28 |
| | | | | * | | | | | | | | Merge github.com:grpc/grpc into fuzzy-bits | Craig Tiller | 2016-03-28 |
| | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge pull request #5900 from murgatroid99/node_callback_convention | Nicolas Noble | 2016-03-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5945 from ahedberg/ip_pktinfo_optional | Nicolas Noble | 2016-03-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5973 from ctiller/optionalize_chttp2 | Nicolas Noble | 2016-03-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | | | | | | | * \ | Merge branch 'master' of github.com:grpc/grpc into sockaddr_resolver_lb | David Garcia Quintas | 2016-03-28 |
| | | | | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |||
| | | | | | | | | | | | | | * | | PR comments. | David Garcia Quintas | 2016-03-28 |
| | | | | | | | | | | | | * | | | Merge branch 'master' of github.com:grpc/grpc into lb_policies_new_interface | David Garcia Quintas | 2016-03-28 |
| | | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | |||
| | | | | | | | | | | | * | | | | small improvements to channel_args docstrings | David Garcia Quintas | 2016-03-28 |
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||
| | | | | | | | | * | | | | | | Merge github.com:grpc/grpc into gource | Craig Tiller | 2016-03-28 |
| | | | | | | | | |\ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | | Merge github.com:grpc/grpc into optionalize_chttp2 | Craig Tiller | 2016-03-28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Merge pull request #5935 from ctiller/status_codes | jboeuf | 2016-03-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | | | merge to take src/core componentization into account | ahedberg | 2016-03-28 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | | | tell older compilers that not using fd is okay | ahedberg | 2016-03-28 |
| | | | | | | | | * | | | | | | Fix includes | Craig Tiller | 2016-03-28 |
| | | | | | | * | | | | | | | | Fix indentation in config files, set defaults for longer term runs | Sree Kuchibhotla | 2016-03-28 |
| | | | * | | | | | | | | | | | fix copyright to include 2015 | ahedberg | 2016-03-28 |
| | | | | | | | | | | | | | * | Merge pull request #5974 from murgatroid99/node_distribtest_fixes | Nicolas Noble | 2016-03-28 |
| | | | | | | | | | | | | | |\ |