Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #2493 from a-veitch/record_stat | Craig Tiller | 2015-07-23 |
|\ | | | | | Census record stats API | ||
* \ | Merge pull request #2542 from ctiller/tell-me-who-you-might-be | Yang Gao | 2015-07-23 |
|\ \ | | | | | | | Expose call peer uri from C core | ||
* \ \ | Merge pull request #2474 from nicolasnoble/lets-actually-build-32-bits | Jan Tattermusch | 2015-07-20 |
|\ \ \ | | | | | | | | | Making sure we build 32 bits in Jenkins. | ||
| * | | | Making sure that 32 bits is being built and run on Jenkins. | Nicolas "Pixel" Noble | 2015-07-21 |
| | | | | |||
| | * | | Add ipv4:, ipv6: schemes | Craig Tiller | 2015-07-20 |
| |/ / |/| | | |||
* | | | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵ | Craig Tiller | 2015-07-19 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak | ||
* \ \ \ | Merge with head and resolve conflict | yang-g | 2015-07-17 |
|\ \ \ \ | |||
| | | | * | rebuild makefile | Alistair Veitch | 2015-07-17 |
| | | | | | |||
| * | | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | Craig Tiller | 2015-07-17 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| | * | | | Merge with head | yang-g | 2015-07-16 |
| | |\ \ \ | |||
| | * | | | | split iterator into its own file | yang-g | 2015-07-16 |
| | | |_|/ | | |/| | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-16 |
| | | | |\ | | | | |/ | | | |/| | |||
| | | * | | Merge pull request #2460 from vjpai/exposed_pool | Craig Tiller | 2015-07-16 |
| | | |\ \ | | | | | | | | | | | | | Make thread_pool.h a public header | ||
| | | | * | | Change name of thread_pool files to fixed_size_thread_pool when | vjpai | 2015-07-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | appropriate | ||
| | | * | | | Merge pull request #2462 from nicolasnoble/bash-is-not-for-everyone | Michael Lumish | 2015-07-15 |
| | | |\ \ \ | | | | | | | | | | | | | | | Replacing echo -e with a more generic system. | ||
| | | | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-15 |
| | | | | | |\ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Makefile # include/grpc++/client_context.h # include/grpc++/server_context.h # src/cpp/client/client_context.cc # src/cpp/server/server_context.cc # vsprojects/Grpc.mak | ||
| | | | * | | | Replacing echo -e with a more generic system. | Nicolas "Pixel" Noble | 2015-07-15 |
| | | |/ / / | | |/| | | | | | | | | | | | | | | | The 'tr' command can actually accept escapes, such as \n. | ||
| | | | * | | Make thread_pool.h a public header | Vijay Pai | 2015-07-15 |
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | Rename ThreadPool -> FixedSizeThreadPool to allow for later introduction of DynamicSizeThreadPool | ||
* | | | | | Add oauth2_auth_token test case in interop test | yang-g | 2015-07-13 |
| | | | | | |||
| * | | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | Craig Tiller | 2015-07-13 |
| |\| | | | |||
| * | | | | Introduce a clock type field onto gpr_timespec. | Craig Tiller | 2015-07-13 |
|/ / / / | | | | | | | | | | | | | | | | | Use it to validate that arithmetic on time types makes even some vague kind of sense. | ||
| | * | | Merge branch 'master' into lockfree-stack | vjpai | 2015-07-10 |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Debug and add in generated build files | Vijay Pai | 2015-07-10 |
| | | | | |||
| * | | | Merge pull request #2380 from ctiller/slartiwhatfast | Vijay Pai | 2015-07-10 |
| |\ \ \ | | | | | | | | | | | Make naming a little more consistent | ||
| * \ \ \ | Merge pull request #2382 from murgatroid99/makefile_cache_detection | Nicolas Noble | 2015-07-10 |
| |\ \ \ \ | | | | | | | | | | | | | Add caching for Makefile dependency detection | ||
| | | | * | | Initial checkin commit for lockfree stack. | Vijay Pai | 2015-07-10 |
| | | | | | | | | | | | | | | | | | | | | | | | | Tests not yet included. | ||
| | * | | | | 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 |
|/ / / | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into decompression | David Garcia Quintas | 2015-07-09 |
| | |\ | | |/ | |/| | |||
* | | | 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 |
| |\ \ | | | | | | | | | Adding JWT verifier. | ||
| * \ \ | 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 head and resolve conflict | yang-g | 2015-07-07 |
|\| | | | | |||
| * | | | | Merge pull request #2174 from nicolasnoble/makefile-npn-check | jboeuf | 2015-07-07 |
| |\ \ \ \ | | | | | | | | | | | | | Adding a check to find NPN-capable OpenSSL. | ||
* | | | | | | 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 |
| | | | | | | |