Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge github.com:grpc/grpc into ↵ | 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 | 2015-07-24 | |
| |\ | | | | | | | Dynamic-sized thread pool | ||
| * \ | Merge pull request #2605 from yang-g/fake_transport_security_to_private | 2015-07-24 | |
| |\ \ | | | | | | | | | Fake transport security to private | ||
| | | * | Merge branch 'master' into deepend | 2015-07-24 | |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Add dynamic thread pool and initial port of test | 2015-07-23 | |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into ↵ | 2015-07-23 | |
|\| | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | Merge pull request #2493 from a-veitch/record_stat | 2015-07-23 | |
| |\ \ \ | | | | | | | | | | | Census record stats API | ||
| * \ \ \ | Merge pull request #2542 from ctiller/tell-me-who-you-might-be | 2015-07-23 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | Expose call peer uri from C core | ||
| | | | * | move fake_transport_security_credentials to private API | 2015-07-21 | |
| | |_|/ | |/| | | |||
* | | | | Merge github.com:grpc/grpc into ↵ | 2015-07-20 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: include/grpc/grpc.h | ||
| * | | | Merge pull request #2474 from nicolasnoble/lets-actually-build-32-bits | 2015-07-20 | |
| |\ \ \ | | | | | | | | | | | Making sure we build 32 bits in Jenkins. | ||
| | * | | | Making sure that 32 bits is being built and run on Jenkins. | 2015-07-21 | |
| | | | | | |||
| | | * | | Add ipv4:, ipv6: schemes | 2015-07-20 | |
| | |/ / | |/| | | |||
* | | | | Merge github.com:grpc/grpc into ↵ | 2015-07-20 | |
|\| | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵ | 2015-07-19 | |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak | ||
* | \ \ \ | Merge github.com:grpc/grpc into ↵ | 2015-07-17 | |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| | * \ \ \ | Merge with head and resolve conflict | 2015-07-17 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | | * | rebuild makefile | 2015-07-17 | |
| | | | | | | |||
| * | | | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | 2015-07-17 | |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | * | | | | Merge with head | 2015-07-16 | |
| | |\ \ \ \ | |||
| | * | | | | | split iterator into its own file | 2015-07-16 | |
| | | |_|_|/ | | |/| | | | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-16 | |
| | | | | |\ | | | | |_|/ | | | |/| | | |||
* | | | | | | Merge github.com:grpc/grpc into ↵ | 2015-07-16 | |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | | | Merge pull request #2460 from vjpai/exposed_pool | 2015-07-16 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Make thread_pool.h a public header | ||
* | | | | | | | Added connectivity tests, fixed bugs | 2015-07-16 | |
| | | | | | | | |||
| | * | | | | | Change name of thread_pool files to fixed_size_thread_pool when | 2015-07-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate | ||
* | | | | | | | Client connectivity API | 2015-07-15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial plumbing work; needs tests and more client_channel implementation. | ||
| * | | | | | | Merge pull request #2462 from nicolasnoble/bash-is-not-for-everyone | 2015-07-15 | |
|/| | | | | | | | | | | | | | | | | | | | | Replacing echo -e with a more generic system. | ||
| | | | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 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. | 2015-07-15 | |
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | The 'tr' command can actually accept escapes, such as \n. | ||
| | * | | | | Make thread_pool.h a public header | 2015-07-15 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | Rename ThreadPool -> FixedSizeThreadPool to allow for later introduction of DynamicSizeThreadPool | ||
| | | * | | Add oauth2_auth_token test case in interop test | 2015-07-13 | |
| | | | | | |||
| | * | | | Merge github.com:grpc/grpc into no-worries-i-can-wait | 2015-07-13 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | * | | | Introduce a clock type field onto gpr_timespec. | 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 | 2015-07-10 | |
|\| | | | |||
* | | | | Debug and add in generated build files | 2015-07-10 | |
| | | | | |||
| * | | | Merge pull request #2380 from ctiller/slartiwhatfast | 2015-07-10 | |
| |\ \ \ | | | | | | | | | | | Make naming a little more consistent | ||
| * \ \ \ | Merge pull request #2382 from murgatroid99/makefile_cache_detection | 2015-07-10 | |
| |\ \ \ \ | | | | | | | | | | | | | Add caching for Makefile dependency detection | ||
* | | | | | | Initial checkin commit for lockfree stack. | 2015-07-10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Tests not yet included. | ||
| | * | | | | Added caching for HAS_SYSTEMTAP in Makefile | 2015-07-10 | |
| | | | | | | |||
| | * | | | | Add caching for Makefile dependency detection | 2015-07-10 | |
| |/ / / / |/| | | | | |||
| | * | | | Make naming a little more consistent | 2015-07-10 | |
| | |/ / | |||
| * / / | Add a version string and a function to retrieve it | 2015-07-10 | |
| |/ / | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-09 | |
| | |\ | |_|/ |/| | | |||
| * | | Makefile regeneration to pass sanity test | 2015-07-09 | |
| | | | |||
| * | | Merge remote-tracking branch 'upstream/master' into security_context2 | 2015-07-09 | |
| |\ \ | |/ / |/| | | |||
* | | | Merge pull request #2252 from jboeuf/jwt_verifier | 2015-07-08 | |
|\ \ \ | | | | | | | | | Adding JWT verifier. | ||
* \ \ \ | Merged changes from master | 2015-07-08 | |
|\ \ \ \ | |||
| | * \ \ | Merge branch 'master' of github.com:grpc/grpc into jwt_verifier | 2015-07-08 | |
| | |\ \ \ | | |/ / / | |/| | | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into decompression | 2015-07-08 | |
| | | | |\ |