Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into cares_buildin | 2016-11-08 | |
|\ | |||
| * | Merge pull request #8345 from muxi/recover-end2end-test | 2016-11-08 | |
| |\ | | | | | | | Recover the missing CoreCronetEnd2EndTests.m | ||
* | \ | Merge branch 'cares_env' into cares_buildin | 2016-11-08 | |
|\ \ \ | |||
| * | | | Remove C++ native resolver test on windows | 2016-11-08 | |
| | | | | |||
| | * | | Merge pull request #8618 from markdroth/channel_info_api | 2016-11-08 | |
| | |\ \ | | | | | | | | | | | Add API for getting arbitrary state back from a channel | ||
| | * \ \ | Merge pull request #8667 from wenbozhu/master | 2016-11-08 | |
| | |\ \ \ | | | | | | | | | | | | | Create PROTOCOL-WEB.md | ||
| | * \ \ \ | Merge pull request #8681 from ctiller/fix2 | 2016-11-08 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | Fix test | ||
| | | * | | | | Fix test | 2016-11-08 | |
| | |/ / / / | |||
| | * | | | | Merge pull request #8532 from ctiller/grpc_slice | 2016-11-08 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | Rename gpr_slice --> grpc_slice | ||
| | | * \ \ \ | Merge github.com:grpc/grpc into grpc_slice | 2016-11-08 | |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | * | | | | | Merge pull request #8586 from ctiller/securityfuzzit | 2016-11-08 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add credentials creation to api_fuzzer | ||
| | | * \ \ \ \ | Merge github.com:grpc/grpc into securityfuzzit | 2016-11-08 | |
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | * | | | | | | Merge pull request #8579 from ctiller/apifuzzit | 2016-11-08 | |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add resource quota configuration to API fuzzer | ||
| | | * \ \ \ \ \ | Merge branch 'fuzzit' into apifuzzit | 2016-11-08 | |
| | | |\ \ \ \ \ \ | |||
| | | | * \ \ \ \ \ | Merge github.com:grpc/grpc into fuzzit | 2016-11-08 | |
| | | | |\ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | |||
| | | | | | * | | | | Merge github.com:grpc/grpc into grpc_slice | 2016-11-08 | |
| | | | | | |\ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| | * | | | | | | | | Merge pull request #8678 from ctiller/fixxxx | 2016-11-08 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Fix sanity | ||
| | | * | | | | | | | | Fix sanity | 2016-11-08 | |
| | |/ / / / / / / / | |||
| | | | | | * | | | | Merge | 2016-11-08 | |
| | | | | | | | | | | |||
| | | | | | * | | | | Merge github.com:grpc/grpc into grpc_slice | 2016-11-08 | |
| | | | | | |\ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | |||
| | * | | | | | | | | Merge pull request #8080 from ctiller/decouple_version_number | 2016-11-08 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Allow decoupling core version number from wrapper version numbers | ||
| | | | | | | * | | | | Remove errant header | 2016-11-08 | |
| | | | | | | | | | | | |||
| | | | | | | * | | | | Merge github.com:grpc/grpc into grpc_slice | 2016-11-08 | |
| | | | | | | |\ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | |||
| | | * | | | | | | | | s/std::string/grpc::string/g | 2016-11-08 | |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #8241 from muxi/core-end2end-tests-cronet-update | 2016-11-07 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Core end2end tests cronet update | ||
| | * \ \ \ \ \ \ \ \ \ | Merge pull request #8522 from lizan/write_compressed_byte_buffer | 2016-11-07 | |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip compress filter if byte_buffer is compressed | ||
| | * \ \ \ \ \ \ \ \ \ \ | Merge pull request #8659 from dgquintas/grpclb_call_cancel_locked | 2016-11-07 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed unprotected access to lb policy data | ||
* | | | | | | | | | | | | | | Fix python build | 2016-11-07 | |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | * | | | Create PROTOCOL-WEB.md | 2016-11-07 | |
| | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |||
| * / | | | | | | | | | | | Add env variable GRPC_DNS_RESOLVER | 2016-11-07 | |
|/ / / / / / / / / / / / | |||
| * | | | | | | | | | | | Merge pull request #8641 from ctiller/more-wtfs | 2016-11-07 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Make resource_quota a heap allocated object | ||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #8596 from thinkerou/fix_php_style_by_cs | 2016-11-07 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP: update php style | ||
| | | | | | | | | | | | * | | Fix build problem. | 2016-11-07 | |
| | | | | | | | | | | | | | | |||
| | | | | | | | | | | | * | | Fix C++ filter API and add test for it. | 2016-11-07 | |
| | | | | | | | | | | | | | | |||
| | | | * | | | | | | | | | | Fixed unprotected access to lb policy data | 2016-11-07 | |
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||
| | | | | * | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | 2016-11-07 | |
| | | | | |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | core-end2end-tests-cronet-update | ||
| | | | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' into channel_info_api | 2016-11-07 | |
| | | | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge pull request #8644 from ctiller/shorter-timeout | 2016-11-05 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase test timeouts | ||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #8643 from ctiller/sane | 2016-11-04 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Order files - things were making sanity sad | ||
| | | | | | | | * | | | | | | | Get user agent right | 2016-11-04 | |
| | | | | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | | Fix dependency glitch | 2016-11-04 | |
| | | | | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | | Merge branch 'sane' into decouple_version_number | 2016-11-04 | |
| | | | | | | | |\ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | |||
| | | | | | | | * | | | | | | | Merge github.com:grpc/grpc into decouple_version_number | 2016-11-04 | |
| | | | | | | | |\ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | Merge pull request #8628 from soltanmm-google/turtles | 2016-11-04 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly stop the server on tear-down | ||
| | | | * | | | | | | | | | | | | Increase test timeouts | 2016-11-04 | |
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests are failing when run as a batch, but passing when run in isolation. Suspect something more is up, but this will at least make our builds much greener until we figure that out. | ||
| | | * | | | | | | | | | | | | 80 chars | 2016-11-04 | |
| | | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | Order files - things were making sanity sad | 2016-11-04 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Merge pull request #8456 from ctiller/pid_ctl | 2016-11-04 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple PID controller | ||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #8640 from ctiller/wtf-build | 2016-11-04 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release target once pinged | ||
| | | | | | * | | | | | | | | | | clang-format code | 2016-11-04 | |
| | | | | | | | | | | | | | | | |