Commit message (Expand) | Author | Age | |
---|---|---|---|
* | merge head and resolve conflict | yang-g | 2015-07-07 |
|\ | |||
| * | Merge pull request #2200 from jboeuf/slice_to_cstring | Craig Tiller | 2015-07-07 |
| |\ | |||
| * \ | Merge pull request #2242 from a-veitch/external_api_2 | Craig Tiller | 2015-07-07 |
| |\ \ | |||
* | | | | Merge remote-tracking branch 'upstream/master' into security_context2 | yang-g | 2015-07-07 |
|\| | | | |||
| | | * | Merge branch 'master' of https://github.com/grpc/grpc into slice_to_cstring | Julien Boeuf | 2015-07-08 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Avoid finishing writes until data actually sent | Craig Tiller | 2015-07-07 |
| * | | | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-07-07 |
| |\ \ \ | |||
| * | | | | Fix Windows Crash | Craig Tiller | 2015-07-07 |
| | * | | | Merge pull request #2306 from ctiller/reset-thy-counts-or-fear-my-wrath | Vijay Pai | 2015-07-07 |
| | |\ \ \ | |||
* | | \ \ \ | Merge remote-tracking branch 'upstream/master' into security_context2 | yang-g | 2015-07-06 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #2307 from ctiller/im-so-pretty | Yang Gao | 2015-07-06 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge pull request #2293 from ctiller/pack-your-bags | David G. Quintas | 2015-07-06 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | Add a unit test | yang-g | 2015-07-06 |
| | | | * | | | | Guard against double pollset shutdown completion | Craig Tiller | 2015-07-06 |
* | | | | | | | | merge with upstream and resolve conflicts | yang-g | 2015-07-06 |
|\| | | | | | | | |||
* | | | | | | | | compiles | yang-g | 2015-07-06 |
| | | | * | | | | Add a short description of available resolution schemes | Craig Tiller | 2015-07-06 |
| | | * | | | | | Make log lines line up and be prettier | Craig Tiller | 2015-07-06 |
| | |/ / / / / | |/| | | | | | |||
| | | * | | | | Merge branch 'reset-thy-counts-or-fear-my-wrath' into tis-but-thy-name | Craig Tiller | 2015-07-06 |
| | | |\| | | | |||
| | | | * | | | Fix potential double delete | Craig Tiller | 2015-07-06 |
| | |_|/ / / | |/| | | | | |||
| | | * | | | Fix segfault | Craig Tiller | 2015-07-06 |
| | | * | | | Fix bad assert, memory leak | Craig Tiller | 2015-07-06 |
| | | * | | | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-07-06 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #2117 from dgquintas/bb_from_bbreader | Craig Tiller | 2015-07-05 |
| |\ \ \ \ \ | |||
| | | * | | | | Structure repacking and sizing | Craig Tiller | 2015-07-02 |
| | |/ / / / | |/| | | | | |||
| * | | | | | Fix refcount leak | Craig Tiller | 2015-07-01 |
| * | | | | | Merge pull request #2284 from ctiller/oops-i-split-it-again | David G. Quintas | 2015-07-01 |
| |\ \ \ \ \ | |||
| | | | * | | | Remove debug code | Craig Tiller | 2015-07-01 |
| | * | | | | | Properly reset counter | Craig Tiller | 2015-07-01 |
| | * | | | | | Remove errant assert | Craig Tiller | 2015-07-01 |
| | | | * | | | Correct comments | Craig Tiller | 2015-07-01 |
| * | | | | | | Merge pull request #2282 from ctiller/red-orange-yellow-green-blue-indigo-violet | Nicolas Noble | 2015-07-01 |
| |\ \ \ \ \ \ | |||
| | | | | * \ \ | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-07-01 |
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| | * | | | | | | Fix a TSAN reported race | Craig Tiller | 2015-07-01 |
| * | | | | | | | Merge pull request #2277 from ctiller/in-the-town-where-i-was-born-there-live... | Nicolas Noble | 2015-07-01 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | | | * | | | Expand comment | Craig Tiller | 2015-07-01 |
| | | | | * | | | Expand comment | Craig Tiller | 2015-07-01 |
| | | | | * | | | Expand comment | Craig Tiller | 2015-07-01 |
| * | | | | | | | Don't unregister resolver object until callback complete | Craig Tiller | 2015-07-01 |
| * | | | | | | | Delay unregister of fd until freelisted | Craig Tiller | 2015-07-01 |
| * | | | | | | | Try harder to return DEADLINE_EXCEEDED when we should | Craig Tiller | 2015-07-01 |
| | * | | | | | | Fix a bug in the multipoll on poll path where we use a file descriptor thats ... | Craig Tiller | 2015-07-01 |
| |/ / / / / / | |||
| | | | * | | | Change capitalization | Craig Tiller | 2015-07-01 |
| | | | * | | | Simplify check | Craig Tiller | 2015-07-01 |
| | | | * | | | Add missing unlock | Craig Tiller | 2015-07-01 |
| | | | * | | | Remove random includes of windows.h | Craig Tiller | 2015-07-01 |
| | | | * | | | clang-format changed files | Craig Tiller | 2015-07-01 |
| | | | * | | | Fix a list management bug exposed by new locking scheme in client_channel | Craig Tiller | 2015-07-01 |
| | | | * | | | Spam cleanup | Craig Tiller | 2015-07-01 |
| | | | * | | | Spam cleanup | Craig Tiller | 2015-07-01 |