Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into cleaner-posix2 | Craig Tiller | 2016-03-30 |
|\ | |||
* \ | Merge branch 'cleaner-posix2' of github.com:ctiller/grpc into cleaner-posix2 | Craig Tiller | 2016-03-30 |
|\ \ | |||
* | | | Add compilation guards for posix only code | Craig Tiller | 2016-03-30 |
| | | | |||
| | * | Merge pull request #5699 from ctiller/accounting | Bogdan Drutu | 2016-03-30 |
| | |\ | | | | | | | | | Introduce byte counting to the transport API | ||
| | * \ | Merge pull request #5764 from ctiller/internal-canary | Nicolas Noble | 2016-03-30 |
| | |\ \ | | | | | | | | | | | Initial canaries for downstream merges | ||
| | * \ \ | Merge pull request #5984 from jtattermusch/perf_tests_script | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ | | | | | | | | | | | | | Add python script for running performance tests | ||
| | * \ \ \ | Merge pull request #6021 from grpc/release-0_13 | Nicolas Noble | 2016-03-30 |
| | |\ \ \ \ | | | | | | | | | | | | | | | 0.13 a tiny upmerge | ||
| | * \ \ \ \ | Merge pull request #5894 from soltanmm/stop-that | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Don't allow precompiled binaries in tests | ||
| | * \ \ \ \ \ | Merge pull request #6025 from jtattermusch/csharp_refactor_building_take2 | Jan Tattermusch | 2016-03-30 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Refactor C# building in run_tests.py (revert a revert) | ||
| | | * | | | | | | dont break mac build by EMBED_ZLIB=true again | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | |||
| | | * | | | | | | make C# mac build use same args as in artifact builder | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | |||
| | * | | | | | | | Merge pull request #5966 from jtattermusch/interop_worker_script | adelez | 2016-03-30 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Add script to create interop worker | ||
| | | * | | | | | | | Add a comment. | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | | * | | | | | | dont break the mac build | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | | * | | | | | | disable C# arch choosing for now | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | | * | | | | | | refactor C# building | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | | * | | | | | | polish some .bat files | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | | | |||
| | | | * | | | | | | always embed zlib and openssl for C# | Jan Tattermusch | 2016-03-30 |
| | | |/ / / / / / | | |/| | | | | | | |||
| | | | | | | | * | Fix merge error | Craig Tiller | 2016-03-30 |
| | | | | | | | | | |||
| * | | | | | | | | Merge github.com:grpc/grpc into cleaner-posix2 | Craig Tiller | 2016-03-30 |
|/| | | | | | | | | |/ / / / / / / | |||
| | | | | | | * | 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 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Revert "Refactor C# building in run_tests.py" | ||
| * \ \ \ \ \ \ \ | Merge pull request #6022 from grpc/revert-5933-sockaddr_resolver_lb | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Revert "added grpclb support to sockaddr resolver" | ||
| | * | | | | | | | | Revert "added grpclb support to sockaddr resolver" | Craig Tiller | 2016-03-30 |
| |/ / / / / / / / | |||
* | | | | | | | | | Fix include path | Craig Tiller | 2016-03-30 |
| | | | | | | | | | |||
| * | | | | | | | | Merge pull request #6014 from nicolasnoble/manual-upmerge | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Manual upmerge from 0.13 | ||
* | | | | | | | | | | Fix include guards | Craig Tiller | 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 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | added grpclb support to sockaddr resolver | ||
| * \ \ \ \ \ \ \ \ | Merge pull request #5950 from dgquintas/lb_policies_new_interface | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Changes to resolver-LB interfaces. | ||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #5978 from dgquintas/channel_args_docs | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | small improvements to channel_args docstrings | ||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #5997 from vjpai/i_know_async | Jan Tattermusch | 2016-03-30 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Concurrent async server coverage in thread stress test | ||
| | | | | | | | | * \ \ \ | Merge pull request #6008 from soltanmm/oops | Jan Tattermusch | 2016-03-30 |
| | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missing dependencies | ||
| * | | | | | | | | \ \ \ \ | Merge pull request #5963 from jtattermusch/csharp_refactor_building | Stanley Cheung | 2016-03-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor C# building in run_tests.py | ||
| | | | | | | * | | | | | | | | 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 |
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport of #5735 | ||
| | | | | | | | | | | * | | | | Add missing dependencies | Masood Malekghassemi | 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 |
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `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/uhoh | Craig Tiller | 2016-03-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trim number of CPUs | ||
| | * | | | | | | | | | | | | Trim number of CPUs | Craig Tiller | 2016-03-29 |
| |/ / / / / / / / / / / / | |||
| * | | | | | | | | | | | | Merge pull request #5976 from earhart/master | Nicolas Noble | 2016-03-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for the GRPC Bazel build | ||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5979 from ctiller/gource | Nicolas Noble | 2016-03-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a script that generates a nice gource visualization | ||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5846 from ctiller/fuzzy-bits | Nicolas Noble | 2016-03-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fuzzer support | ||
| | | | * | | | | | | | | | | | | Add protobuf_clib to deps of grpc++_codegen_lib | Rob Earhart | 2016-03-29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is required in order to compile grpc++_codegen_lib. | ||
| | | | * | | | | | | | | | | | | Fix the Bazel build re/nanopb | Rob Earhart | 2016-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 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Objective C: kSCNetworkReachabilityFlagsIsWWAN is only available on iOS |