Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #2731 from nicolasnoble/regen-and-vs-tweaks | Jan Tattermusch | 2015-07-30 |
|\ | | | | | Regenerating project files and massaging VS project files. | ||
| * | Regenerating project files and massaging VS project files. | Nicolas Noble | 2015-07-30 |
| | | |||
* | | Merge branch 'master' into issue_2709 | Alistair Veitch | 2015-07-30 |
|\| | |||
* | | Move grpc_census_call_*_context calls into public header | Alistair Veitch | 2015-07-30 |
| | | |||
| * | Merge pull request #2506 from larsonmpdx/gitt | Nicolas Noble | 2015-07-28 |
| |\ | | | | | | | changes to allow VS solution/project generation and grpc.mak generation for c++ tests | ||
| * \ | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-26 |
| |\ \ | |/ / |/| | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: src/core/iomgr/tcp_server_windows.c | ||
* | | | Merge pull request #2647 from vjpai/deepend | Yang Gao | 2015-07-24 |
|\ \ \ | | | | | | | | | Dynamic-sized thread pool | ||
* \ \ \ | Merge pull request #2605 from yang-g/fake_transport_security_to_private | jboeuf | 2015-07-24 |
|\ \ \ \ | | | | | | | | | | | Fake transport security to private | ||
| | * \ \ | Merge branch 'master' into deepend | Vijay Pai | 2015-07-24 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | * | | | Add dynamic thread pool and initial port of test | vjpai | 2015-07-23 |
| | | | | | |||
| | | * | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-23 |
| | | |\ \ | |_|_|/ / |/| | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
* | | | | | Merge pull request #2493 from a-veitch/record_stat | Craig Tiller | 2015-07-23 |
|\ \ \ \ \ | | | | | | | | | | | | | Census record stats API | ||
| | * | | | | move fake_transport_security_credentials to private API | yang-g | 2015-07-21 |
| | |/ / / | |||
| | | | * | mark not building windows tests as platforms = posix in build.json | Michael Larson | 2015-07-20 |
| | | | | | |||
* | | | | | Add ipv4:, ipv6: schemes | Craig Tiller | 2015-07-20 |
| |/ / / |/| | | | |||
| * | | | address comments | Alistair Veitch | 2015-07-20 |
| | | | | |||
| | * | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-20 |
| | |\ \ | |_|/ / |/| | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
* | | | | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵ | Craig Tiller | 2015-07-19 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak | ||
| | | * | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-17 |
| | | |\ | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
* | | | \ | Merge with head and resolve conflict | yang-g | 2015-07-17 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| | | * | | add record_stat API | 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 github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-16 |
| | | | | |\ | | | | |_|/ | | | |/| | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| | | * | | | 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 | ||
| | | | | | * | Client connectivity API | Craig Tiller | 2015-07-15 |
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | Initial plumbing work; needs tests and more client_channel implementation. | ||
| | | | | * | 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 | ||
| | | | * | | 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 |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Test code | vjpai | 2015-07-10 |
| | | | | |||
| * | | | Merge pull request #2380 from ctiller/slartiwhatfast | Vijay Pai | 2015-07-10 |
| |\ \ \ | | | | | | | | | | | Make naming a little more consistent | ||
| | | * | | Initial checkin commit for lockfree stack. | Vijay Pai | 2015-07-10 |
| | | | | | | | | | | | | | | | | | | | | Tests not yet included. | ||
| | * | | | 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 |
| | |\ | | |/ | |/| | |||
* | | | Merge remote-tracking branch 'upstream/master' into security_context2 | yang-g | 2015-07-09 |
|\| | | |||
| * | | 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 |
| | | |\ | | | |/ | | |/| | |||
* | | | | resolve comments | yang-g | 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 |
| | | | | | |||
| | * | | | Merge branch 'reset-thy-counts-or-fear-my-wrath' into tis-but-thy-name | Craig Tiller | 2015-07-06 |
| | |\ \ \ | | |/ / / | |/| | | |