aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* Merge github.com:grpc/grpc into cleaner-posix2Gravatar Craig Tiller2016-03-30
|\
| * Merge pull request #6020 from grpc/revert-5963-csharp_refactor_buildingGravatar Jan Tattermusch2016-03-30
| |\ | | | | | | Revert "Refactor C# building in run_tests.py"
| * \ Merge pull request #6022 from grpc/revert-5933-sockaddr_resolver_lbGravatar Jan Tattermusch2016-03-30
| |\ \ | | | | | | | | Revert "added grpclb support to sockaddr resolver"
| | * | Revert "added grpclb support to sockaddr resolver"Gravatar Craig Tiller2016-03-30
| |/ /
* | | Fix include pathGravatar Craig Tiller2016-03-30
| | |
| * | Merge pull request #6014 from nicolasnoble/manual-upmergeGravatar Jan Tattermusch2016-03-30
| |\ \ | | | | | | | | Manual upmerge from 0.13
* | | | Fix include guardsGravatar Craig Tiller2016-03-30
| | | |
| | | * Revert "Refactor C# building in run_tests.py"Gravatar Jan Tattermusch2016-03-30
| | |/ | |/|
| * | Merge pull request #5933 from dgquintas/sockaddr_resolver_lbGravatar Jan Tattermusch2016-03-30
| |\ \ | | | | | | | | added grpclb support to sockaddr resolver
| * \ \ Merge pull request #5950 from dgquintas/lb_policies_new_interfaceGravatar Jan Tattermusch2016-03-30
| |\ \ \ | | | | | | | | | | Changes to resolver-LB interfaces.
| * \ \ \ Merge pull request #5978 from dgquintas/channel_args_docsGravatar Jan Tattermusch2016-03-30
| |\ \ \ \ | | | | | | | | | | | | small improvements to channel_args docstrings
| * \ \ \ \ Merge pull request #5997 from vjpai/i_know_asyncGravatar Jan Tattermusch2016-03-30
| |\ \ \ \ \ | | | | | | | | | | | | | | Concurrent async server coverage in thread stress test
| * \ \ \ \ \ Merge pull request #5963 from jtattermusch/csharp_refactor_buildingGravatar Stanley Cheung2016-03-29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Refactor C# building in run_tests.py
| | | | | | | * Merge branch 'release-0_13' into manual-upmergeGravatar Nicolas "Pixel" Noble2016-03-30
| | |_|_|_|_|/| | |/| | | | | |
| | | | | | | * Merge pull request #6004 from nicolasnoble/backport-of-5735Gravatar Nicolas Noble2016-03-29
| | | | | | | |\ | | | | | | | | | | | | | | | | | | Backport of #5735
| | | | | | | | * Better memory management for grpc_rb_byte_buffer_to_s.Gravatar Nicolas "Pixel" Noble2016-03-30
| | | | | | | | |
| | | | | | | | * Fix Ruby memory leaksGravatar Zhuochun2016-03-30
| | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `recv_message` is not cleaned up after call - `send_message` is not cleaned up in failure cases - `xmalloc` ruby string is not freed after used
| * | | | | | | Merge pull request #6003 from ctiller/uhohGravatar Craig Tiller2016-03-29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Trim number of CPUs
| | * | | | | | | Trim number of CPUsGravatar Craig Tiller2016-03-29
| |/ / / / / / /
| * | | | | | | Merge pull request #5976 from earhart/masterGravatar Nicolas Noble2016-03-29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fixes for the GRPC Bazel build
| * \ \ \ \ \ \ \ Merge pull request #5979 from ctiller/gourceGravatar Nicolas Noble2016-03-29
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a script that generates a nice gource visualization
| * \ \ \ \ \ \ \ \ Merge pull request #5846 from ctiller/fuzzy-bitsGravatar Nicolas Noble2016-03-29
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fuzzer support
| | | | * | | | | | | Add protobuf_clib to deps of grpc++_codegen_libGravatar Rob Earhart2016-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required in order to compile grpc++_codegen_lib.
| | | | * | | | | | | Fix the Bazel build re/nanopbGravatar Rob Earhart2016-03-29
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change modifies the BUILD rule dependencies used for nanopb, switching them from third_party to //external -- the former uses submodules, which don't work well with Bazel (since Bazel removes submodules from repositories as it fetches them, preferring instead to unify submodule versions across the workspace via the top-level WORKSPACE configuration).
| | * | | | | | | | Fix codegenGravatar Craig Tiller2016-03-29
| | | | | | | | | |
| | * | | | | | | | Merge github.com:grpc/grpc into fuzzy-bitsGravatar Craig Tiller2016-03-29
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #5736 from pquerna/pq/is_wan_is_ios_onlyGravatar Jan Tattermusch2016-03-29
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Objective C: kSCNetworkReachabilityFlagsIsWWAN is only available on iOS
| * \ \ \ \ \ \ \ \ \ Merge pull request #5971 from sreecha/stress_test_flexible_configGravatar Jan Tattermusch2016-03-29
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Stress test flexible config
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #5904 from jtattermusch/csharp_perf_intergrateGravatar Jan Tattermusch2016-03-29
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | C# performance worker improvements
* | | | | | | | | | | | | Merge github.com:grpc/grpc into cleaner-posix2Gravatar Craig Tiller2016-03-29
|\| | | | | | | | | | | |
| | | | | | | | * | | | | Used TYPED_TEST to parametrizeGravatar Vijay Pai2016-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include all 4 sync/async client/server combos
| | | | | | | | * | | | | clang-formatGravatar Vijay Pai2016-03-29
| | | | | | | | | | | | |
| | | | | | | | * | | | | Add a concurrent test for sync client, async server caseGravatar Vijay Pai2016-03-29
| | | | | | | | | | | | |
* | | | | | | | | | | | | Fix mutexGravatar Craig Tiller2016-03-28
| | | | | | | | | | | | |
| | | | | * | | | | | | | Fix includeGravatar Craig Tiller2016-03-28
| | | | | | | | | | | | |
| | | | | * | | | | | | | Merge github.com:grpc/grpc into fuzzy-bitsGravatar Craig Tiller2016-03-28
| | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #5900 from murgatroid99/node_callback_conventionGravatar Nicolas Noble2016-03-28
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow Node's callback-last convention for client calls
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5945 from ahedberg/ip_pktinfo_optionalGravatar Nicolas Noble2016-03-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make IP_PKTINFO optional.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5973 from ctiller/optionalize_chttp2Gravatar Nicolas Noble2016-03-28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optionalize chttp2
| | | | | | | | | | | | | | * \ Merge branch 'master' of github.com:grpc/grpc into sockaddr_resolver_lbGravatar David Garcia Quintas2016-03-28
| | | | | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | |
| | | | | | | | | | | | | | * | PR comments.Gravatar David Garcia Quintas2016-03-28
| | | | | | | | | | | | | | | |
| | | | | | | | | | | | | * | | Merge branch 'master' of github.com:grpc/grpc into lb_policies_new_interfaceGravatar David Garcia Quintas2016-03-28
| | | | | | | | | | | | | |\ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |
| | | | | | | | | | | | * | | | small improvements to channel_args docstringsGravatar David Garcia Quintas2016-03-28
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| | | | | | | | | * | | | | | Merge github.com:grpc/grpc into gourceGravatar Craig Tiller2016-03-28
| | | | | | | | | |\ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge github.com:grpc/grpc into optionalize_chttp2Gravatar Craig Tiller2016-03-28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge github.com:grpc/grpc into cleaner-posix2Gravatar Craig Tiller2016-03-28
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge pull request #5935 from ctiller/status_codesGravatar jboeuf2016-03-28
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix some status codes to match spec
| | | | * | | | | | | | | | | merge to take src/core componentization into accountGravatar ahedberg2016-03-28
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | tell older compilers that not using fd is okayGravatar ahedberg2016-03-28
| | | | | | | | | | | | | | |
| | | | | | | | | * | | | | | Fix includesGravatar Craig Tiller2016-03-28
| | | | | | | | | | | | | | |