Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #2380 from ctiller/slartiwhatfast | Vijay Pai | 2015-07-10 |
|\ | |||
* \ | Merge pull request #2382 from murgatroid99/makefile_cache_detection | Nicolas Noble | 2015-07-10 |
|\ \ | |||
| * | | Added caching for HAS_SYSTEMTAP in Makefile | murgatroid99 | 2015-07-10 |
| * | | Add caching for Makefile dependency detection | murgatroid99 | 2015-07-10 |
| | * | Make naming a little more consistent | Craig Tiller | 2015-07-10 |
* | | | Add a version string and a function to retrieve it | Craig Tiller | 2015-07-10 |
| |/ |/| | |||
* | | Makefile regeneration to pass sanity test | yang-g | 2015-07-09 |
* | | Merge remote-tracking branch 'upstream/master' into security_context2 | yang-g | 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 |
| | | |\ | | | |/ | | |/| | |||
| | * | | 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 head and resolve conflict | yang-g | 2015-07-07 |
|\| | | | |||
| * | | | Merge pull request #2174 from nicolasnoble/makefile-npn-check | jboeuf | 2015-07-07 |
| |\ \ \ | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into security_context2 | yang-g | 2015-07-07 |
|\| | | | | |||
* | | | | | Add a unit test | yang-g | 2015-07-06 |
* | | | | | merge with upstream and resolve conflicts | yang-g | 2015-07-06 |
|\ \ \ \ \ | |||
* | | | | | | compiles | yang-g | 2015-07-06 |
| | | | * | | 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 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 |
| | | | |\ \ | | | |_|/ / | | |/| | | |