Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into split-me-baby-one-more-time | Craig Tiller | 2016-03-30 |
|\ | |||
| * | Merge pull request #5699 from ctiller/accounting | Bogdan Drutu | 2016-03-30 |
| |\ | |||
| * \ | Merge pull request #5894 from soltanmm/stop-that | Jan Tattermusch | 2016-03-30 |
| |\ \ | |||
* | \ \ | Merge branch 'accounting' into split-me-baby-one-more-time | Craig Tiller | 2016-03-30 |
|\ \ \ \ | | |_|/ | |/| | | |||
| * | | | Fix merge error | Craig Tiller | 2016-03-30 |
* | | | | Merge branch 'accounting' into split-me-baby-one-more-time | Craig Tiller | 2016-03-30 |
|\| | | | |||
| * | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-30 |
| |\| | | |||
| | * | | Revert "added grpclb support to sockaddr resolver" | Craig Tiller | 2016-03-30 |
* | | | | Merge branch 'accounting' into split-me-baby-one-more-time | 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 |
| |\| | | | |||
| | * | | | 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 branch 'release-0_13' into manual-upmerge | Nicolas "Pixel" Noble | 2016-03-30 |
| | | |_|_|/| | | | |/| | | | | | |||
| | | | | | * | | 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 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 #5904 from jtattermusch/csharp_perf_intergrate | Jan Tattermusch | 2016-03-29 |
| | | |\ \ \ \ \ \ \ | |||
* | | | | | | | | | | | Merge branch 'accounting' into split-me-baby-one-more-time | Craig Tiller | 2016-03-28 |
|\| | | | | | | | | | | |||
* | | | | | | | | | | | Merge github.com:grpc/grpc into split-me-baby-one-more-time | Craig Tiller | 2016-03-28 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | Merge github.com:grpc/grpc into accounting | 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 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 optionalize_chttp2 | Craig Tiller | 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 copyright to include 2015 | ahedberg | 2016-03-28 |
| * | | | | | | | | | | | | | Fix include guards | Craig Tiller | 2016-03-28 |
| | * | | | | | | | | | | | | Merge github.com:grpc/grpc into status_codes | Craig Tiller | 2016-03-28 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | |||
| | | | | | | * | | | | | | | Merge github.com:grpc/grpc into fuzzy-bits | Craig Tiller | 2016-03-28 |
| | | | | | | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | |||
| | | | | | * | | | | | | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-28 |
| | | | | | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | | | |||
| | | | | * | | | | | | | | | Make option passing down to the client constructor more consistent | murgatroid99 | 2016-03-28 |
* | | | | | | | | | | | | | | Merge github.com:grpc/grpc into split-me-baby-one-more-time | Craig Tiller | 2016-03-28 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||
| | * | | | | | | | | | | | | Add uses clauses to filegroups to ease dependency management | Craig Tiller | 2016-03-28 |
| | * | | | | | | | | | | | | Declare filegroups for chttp2 | Craig Tiller | 2016-03-28 |
| | | | * | | | | | | | | | | fix copyright | ahedberg | 2016-03-28 |
| | * | | | | | | | | | | | | clang-format | Craig Tiller | 2016-03-28 |
| | * | | | | | | | | | | | | Move chttp2 related files under ext/ | Craig Tiller | 2016-03-28 |
| * | | | | | | | | | | | | | Merge pull request #5964 from ctiller/move_the_things | Nicolas Noble | 2016-03-28 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | | Merge github.com:grpc/grpc into move_the_things | Craig Tiller | 2016-03-28 |
| | |/| | | | | | | | | | | | | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||
| | | | | | * | | | | | | | | Sprinkle constants here and there | Craig Tiller | 2016-03-28 |
| | | | | | * | | | | | | | | Merge github.com:grpc/grpc into accounting | Craig Tiller | 2016-03-28 |
| | | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | Turn off debug | Craig Tiller | 2016-03-26 |