Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-09 |
|\ | |||
| * | Merge pull request #2252 from jboeuf/jwt_verifier | Craig Tiller | 2015-07-08 |
| |\ | |||
| * \ | Merged changes from master | murgatroid99 | 2015-07-08 |
| |\ \ | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into jwt_verifier | Julien Boeuf | 2015-07-08 |
| | | |\ | | | |/ | | |/| | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-08 |
|\ \ \ \ | |||
| | | * | | Fixed typo in variable name | murgatroid99 | 2015-07-08 |
| | | * | | Added OpenSSL NPN pkg-config check | murgatroid99 | 2015-07-08 |
| | | * | | Merged changes from upstream/master | murgatroid99 | 2015-07-08 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | * | | | Don't use pkg-config to look for perftools | murgatroid99 | 2015-07-08 |
| |/ / / | |||
| * | | | Restore sanity | Craig Tiller | 2015-07-08 |
| * | | | Merge pull request #2174 from nicolasnoble/makefile-npn-check | jboeuf | 2015-07-07 |
| |\ \ \ | |||
| | | * | | Made pkg-config a variable in the Makefile | murgatroid99 | 2015-07-06 |
| | | * | | Reversed condition for requiring rt | murgatroid99 | 2015-07-06 |
| | | * | | Make generated .pc files list themselves as libraries | murgatroid99 | 2015-07-06 |
| * | | | | Merge branch 'reset-thy-counts-or-fear-my-wrath' into tis-but-thy-name | Craig Tiller | 2015-07-06 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| | * | | | Merge pull request #2151 from sidrakesh93/master | Vijay Pai | 2015-07-06 |
| | |\ \ \ | |||
| * | | | | | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-07-01 |
| |\| | | | | |||
* | | | | | | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-01 |
|\ \ \ \ \ \ | |||
| | | * \ \ \ | Merge pull request #2268 from murgatroid99/makefile_pkg-config_generate | Nicolas Noble | 2015-07-01 |
| | | |\ \ \ \ | |||
| | | | * | | | | Fixed gpr name in .pc file | murgatroid99 | 2015-07-01 |
| | | | * | | | | Added missing pthread gpr requirement | murgatroid99 | 2015-07-01 |
| | | * | | | | | Tweak timeouts for ?SAN | Craig Tiller | 2015-07-01 |
| | |/ / / / / | |/| | | | | | |||
| | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc | Siddharth Rakesh | 2015-06-30 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | | * | | | | Regenerate Makefile | murgatroid99 | 2015-06-30 |
| | | * | | | | Add .pc file generation to Makefile | murgatroid99 | 2015-06-30 |
| * | | | | | | Merge github.com:grpc/grpc into forever-is-a-long-time | Craig Tiller | 2015-06-30 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc | Siddharth Rakesh | 2015-06-30 |
| | | | |\ \ \ | | | |_|/ / / | | |/| | | | | |||
| | | | | * | | Merge branch 'master' of github.com:grpc/grpc into makefile-npn-check | Nicolas "Pixel" Noble | 2015-06-30 |
| | | | | |\ \ | | | |_|_|/ / | | |/| | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-06-30 |
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | |||
| | | | | | * | Adding JWT verifier. | Julien Boeuf | 2015-06-30 |
| | * | | | | | Fixed some linking problems | murgatroid99 | 2015-06-29 |
| | | | * | | | Resolving merge conflict | Siddharth Rakesh | 2015-06-29 |
| | | | * | | | Adding required changes | Siddharth Rakesh | 2015-06-29 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||
| | * | | / | | Added pkg-config checking to Makefile where possible | murgatroid99 | 2015-06-29 |
| | | |_|/ / | | |/| | | | |||
| | | * | | | Use connectivity state tracking code in chttp2 transport | Craig Tiller | 2015-06-29 |
| | | * | | | Merge branch 'forever-is-a-long-time' into tis-but-thy-name | Craig Tiller | 2015-06-29 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Add an fd conservation test to verify that fds actually close | Craig Tiller | 2015-06-29 |
| | | * | | | Unix resolver, bug fixes | Craig Tiller | 2015-06-29 |
| | | * | | | Factor out channel state watching | Craig Tiller | 2015-06-27 |
| | | * | | | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-06-26 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | * | | | | Merge pull request #2149 from ctiller/oops-i-split-it-again | Vijay Pai | 2015-06-26 |
| | |\ \ \ \ | |||
| * | | | | | | Merge github.com:grpc/grpc into forever-is-a-long-time | Craig Tiller | 2015-06-26 |
| |\| | | | | | |||
| * | | | | | | Tidy up test to meet our standards | Craig Tiller | 2015-06-26 |
| * | | | | | | Rename test into the right place | Craig Tiller | 2015-06-26 |
| * | | | | | | BLARGHAFLARGHAAHAJHAKJHATJHKAYMNHZIYRN | Masood Malekghassemi | 2015-06-25 |
| | | | * | | | Introduce connector, to help subchannel connect | Craig Tiller | 2015-06-25 |
| | | | * | | | Plumbing transport_op changes through | Craig Tiller | 2015-06-25 |
| | | | * | | | Merge branch 'oops-i-split-it-again' into tis-but-thy-name | Craig Tiller | 2015-06-25 |
| | | | |\ \ \ | | | | |/ / / | | | |/| | | | |||
| | | | * | | | Merge github.com:grpc/grpc into tis-but-thy-name | Craig Tiller | 2015-06-25 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| | | * | | | | Merge github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-25 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | |