aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge with headGravatar yang-g2015-07-16
|\
* | split iterator into its own fileGravatar yang-g2015-07-16
| * Merge pull request #2460 from vjpai/exposed_poolGravatar Craig Tiller2015-07-16
| |\
| | * Change name of thread_pool files to fixed_size_thread_pool whenGravatar vjpai2015-07-15
| * | Merge pull request #2462 from nicolasnoble/bash-is-not-for-everyoneGravatar Michael Lumish2015-07-15
| |\ \
| | * | Replacing echo -e with a more generic system.Gravatar Nicolas "Pixel" Noble2015-07-15
| |/ / |/| |
| | * Make thread_pool.h a public headerGravatar Vijay Pai2015-07-15
| |/ |/|
| * Merge branch 'master' into lockfree-stackGravatar vjpai2015-07-10
| |\ | |/ |/|
| * Debug and add in generated build filesGravatar Vijay Pai2015-07-10
* | Merge pull request #2380 from ctiller/slartiwhatfastGravatar Vijay Pai2015-07-10
|\ \
* \ \ Merge pull request #2382 from murgatroid99/makefile_cache_detectionGravatar Nicolas Noble2015-07-10
|\ \ \
| | | * Initial checkin commit for lockfree stack.Gravatar Vijay Pai2015-07-10
| * | | Added caching for HAS_SYSTEMTAP in MakefileGravatar murgatroid992015-07-10
| * | | Add caching for Makefile dependency detectionGravatar murgatroid992015-07-10
| | |/ | |/|
| | * Make naming a little more consistentGravatar Craig Tiller2015-07-10
* | | Add a version string and a function to retrieve itGravatar Craig Tiller2015-07-10
| |/ |/|
* | Makefile regeneration to pass sanity testGravatar yang-g2015-07-09
* | Merge remote-tracking branch 'upstream/master' into security_context2Gravatar yang-g2015-07-09
|\|
| * Merge pull request #2252 from jboeuf/jwt_verifierGravatar Craig Tiller2015-07-08
| |\
| * \ Merged changes from masterGravatar murgatroid992015-07-08
| |\ \
| | | * Merge branch 'master' of github.com:grpc/grpc into jwt_verifierGravatar Julien Boeuf2015-07-08
| | | |\ | | | |/ | | |/|
| | * | Fixed typo in variable nameGravatar murgatroid992015-07-08
| | * | Added OpenSSL NPN pkg-config checkGravatar murgatroid992015-07-08
| | * | Merged changes from upstream/masterGravatar murgatroid992015-07-08
| | |\ \
| * | | | Don't use pkg-config to look for perftoolsGravatar murgatroid992015-07-08
| | |/ / | |/| |
| * | | Restore sanityGravatar Craig Tiller2015-07-08
* | | | merge head and resolve conflictGravatar yang-g2015-07-07
|\| | |
| * | | Merge pull request #2174 from nicolasnoble/makefile-npn-checkGravatar jboeuf2015-07-07
| |\ \ \
* | | | | Merge remote-tracking branch 'upstream/master' into security_context2Gravatar yang-g2015-07-07
|\| | | |
* | | | | Add a unit testGravatar yang-g2015-07-06
* | | | | merge with upstream and resolve conflictsGravatar yang-g2015-07-06
|\ \ \ \ \
* | | | | | compilesGravatar yang-g2015-07-06
| | | | * | Made pkg-config a variable in the MakefileGravatar murgatroid992015-07-06
| | | | * | Reversed condition for requiring rtGravatar murgatroid992015-07-06
| | | | * | Make generated .pc files list themselves as librariesGravatar murgatroid992015-07-06
| | |_|/ / | |/| | |
| | * | | Merge branch 'reset-thy-counts-or-fear-my-wrath' into tis-but-thy-nameGravatar Craig Tiller2015-07-06
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #2151 from sidrakesh93/masterGravatar Vijay Pai2015-07-06
| |\ \ \ \
| | | * \ \ Merge github.com:grpc/grpc into tis-but-thy-nameGravatar Craig Tiller2015-07-01
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #2268 from murgatroid99/makefile_pkg-config_generateGravatar Nicolas Noble2015-07-01
| |\ \ \ \ \
| | * | | | | Fixed gpr name in .pc fileGravatar murgatroid992015-07-01
| | * | | | | Added missing pthread gpr requirementGravatar murgatroid992015-07-01
| * | | | | | Tweak timeouts for ?SANGravatar Craig Tiller2015-07-01
| | | * | | | Merge branch 'master' of https://github.com/grpc/grpcGravatar Siddharth Rakesh2015-06-30
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Regenerate MakefileGravatar murgatroid992015-06-30
| | * | | | | Add .pc file generation to MakefileGravatar murgatroid992015-06-30
| * | | | | | Merge github.com:grpc/grpc into forever-is-a-long-timeGravatar Craig Tiller2015-06-30
| |\| | | | |
| | | * | | | Merge branch 'master' of https://github.com/grpc/grpcGravatar Siddharth Rakesh2015-06-30
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into makefile-npn-checkGravatar Nicolas "Pixel" Noble2015-06-30
| | | | | |\ \ | | | |_|_|/ / | | |/| | | |
| | | | * | | Merge github.com:grpc/grpc into tis-but-thy-nameGravatar Craig Tiller2015-06-30
| | | | |\ \ \ | | | |_|/ / / | | |/| | | |
| | | | | | * Adding JWT verifier.Gravatar Julien Boeuf2015-06-30