Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 #2655 from vjpai/expecteq | Yang Gao | 2015-07-24 |
| |\ \ | | | | | | | | | Switch an int to size_t or else it fails on Mac | ||
| * \ \ | Merge pull request #2662 from vjpai/the_isolation_of_nullptr | Yang Gao | 2015-07-24 |
| |\ \ \ | | | | | | | | | | | Isolate nullptr to grpc namespace when we must define it ourselves | ||
| * \ \ \ | Merge pull request #2605 from yang-g/fake_transport_security_to_private | jboeuf | 2015-07-24 |
| |\ \ \ \ | | | | | | | | | | | | | Fake transport security to private | ||
| | | * | | | Isolate nullptr to grpc namespace when we must define it ourselves | Vijay Pai | 2015-07-25 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | Change the one non-namespace use of nullptr to NULL (used as an argument to a C function anyway) | ||
| | | * | | Switch an int to size_t or else it fails on Mac | vjpai | 2015-07-24 |
| | |/ / | |/| | | |||
| | | * | Merge branch 'master' into deepend | Vijay Pai | 2015-07-24 |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Start off with zero reserve threads to make sure that that case works | Vijay Pai | 2015-07-23 |
| | | | | |||
| | | * | Start switching everything to dynamic pool | Vijay Pai | 2015-07-23 |
| | | | | |||
| * | | | Merge github.com:grpc/grpc into virtuous-velvit-velociraptor | Craig Tiller | 2015-07-23 |
| |\ \ \ | |||
| | | | * | Add dynamic thread pool and initial port of test | vjpai | 2015-07-23 |
| | | | | | |||
| | * | | | Merge pull request #2617 from jboeuf/jwt_creds_renaming | Yang Gao | 2015-07-23 |
| | |\ \ \ | | | | | | | | | | | | | Renaming jwt_credentials to service_account_jwt_access_credentials. | ||
| * | \ \ \ | Merge branch 'flow_control_buf_fix' of github.com:yang-g/grpc into ↵ | Craig Tiller | 2015-07-23 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | virtuous-velvit-velociraptor | ||
* | | | | | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-23 |
|\| | | | | | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| * | | | | | Merge pull request #2542 from ctiller/tell-me-who-you-might-be | Yang Gao | 2015-07-23 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Expose call peer uri from C core | ||
| | | * | | | | Flow control fix | yang-g | 2015-07-22 |
| | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #2571 from vjpai/cent6-issues | Yang Gao | 2015-07-22 |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | Remove one range-based for and do appropriate static casts on nullptr | ||
| | | | * | | Renaming jwt_credentials to service_account_jwt_access_credentials. | Julien Boeuf | 2015-07-22 |
| | |_|/ / | |/| | | | |||
* | | | | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-22 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: src/core/client_config/subchannel.c src/core/iomgr/alarm.c src/core/iomgr/iomgr.c src/core/iomgr/tcp_client_posix.c | ||
| | | | * | merge head and resolve conflict | yang-g | 2015-07-22 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | | * | move fake_transport_security_credentials to private API | yang-g | 2015-07-21 |
| | | | | | |||
| * | | | | Merge pull request #2427 from yang-g/per_call_oauth_creds_impl | Abhishek Kumar | 2015-07-21 |
| |\ \ \ \ | | | | | | | | | | | | | Per call oauth creds impl | ||
| * \ \ \ \ | Merge pull request #2529 from ctiller/prefer-gin-n-tonic | Vijay Pai | 2015-07-21 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Move alarm subsystem to monotonic time | ||
| | | | * | | | Remove iterator-based test altogether | Vijay Pai | 2015-07-21 |
| | | | | | | | |||
* | | | | | | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-21 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other | ||
| | | | * | | | Remove one range-based for and do appropriate static casts on nullptr | Vijay Pai | 2015-07-21 |
| | | | | |/ | | | | |/| | |||
* | | | | | | Merge github.com:grpc/grpc into ↵ | Craig Tiller | 2015-07-20 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | sometimes-its-good-just-to-check-in-with-each-other Conflicts: include/grpc/grpc.h | ||
| | * | | | | Merge github.com:grpc/grpc into now-i-get-to-show-it-to-EVERYBODY | Craig Tiller | 2015-07-20 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | Conflicts: src/cpp/client/channel_arguments.cc | ||
| | | | | * | Merge github.com:grpc/grpc into tell-me-who-you-might-be | Craig Tiller | 2015-07-20 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | | | * | Add grpc_call_get_peer | Craig Tiller | 2015-07-20 |
| | | | | | | |||
| | | | | * | Add ipv4:, ipv6: schemes | Craig Tiller | 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 remote-tracking branch 'upstream/master' into per_call_oauth_creds_impl | yang-g | 2015-07-20 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | * | | | | Remove experimental prefix | Craig Tiller | 2015-07-19 |
| |/ / / / | |||
| | * | | | Merge github.com:grpc/grpc into now-i-get-to-show-it-to-EVERYBODY | Craig Tiller | 2015-07-19 |
| | |\ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: src/cpp/client/channel_arguments.cc | ||
| | | * | | Move alarm subsystem to monotonic time | Craig Tiller | 2015-07-19 |
| | |/ / | |/| | | |||
| * | | | Merge branch 'decompression' of https://github.com/dgquintas/grpc into ↵ | Craig Tiller | 2015-07-19 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dgquintas-decompression Conflicts: Makefile vsprojects/Grpc.mak | ||
| * \ \ \ | Merge pull request #2319 from dgquintas/str_join_with_sep | Nicolas Noble | 2015-07-19 |
| |\ \ \ \ | | | | | | | | | | | | | Added convenience functions gpr_strjoin_sep and grp_strsplit | ||
| | | | * | | User agent string support | Craig Tiller | 2015-07-18 |
| | | | | | | |||
| | | | * | | Make tests a little more robust | Craig Tiller | 2015-07-18 |
| | | | | | | |||
* | | | | | | 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 |
| | |\ \ \ \ | | |/ / / / | |/| | | | | |||
| * | | | | | Merge pull request #2470 from ctiller/i-want-to-wait-free | Vijay Pai | 2015-07-17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Lock free requested call fulfillment path | ||
| | | | * \ \ | Merge branch 'master' of github.com:grpc/grpc into str_join_with_sep | David Garcia Quintas | 2015-07-17 |
| | | | |\ \ \ | | |_|_|/ / / | |/| | | | | | |||
| * | | | | | | Merge pull request #2403 from ctiller/no-worries-i-can-wait | Nicolas Noble | 2015-07-17 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add a clock_type field to gpr_timespec | ||
| | | | | | * | | Removed compression levels from clients and _experimental_'d signature of ↵ | David Garcia Quintas | 2015-07-17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods manipulating compression algorithms | ||
| * | | | | | | | Merge pull request #2482 from vjpai/rename_schedule_callback | Craig Tiller | 2015-07-17 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | ThreadPoolInterface::ScheduleCallback --> ThreadPoolInterface::Add | ||
| | | | | * | | | | update according to spec change | yang-g | 2015-07-17 |
| | | | | | | | | | |||
| * | | | | | | | | Merge pull request #2472 from nicolasnoble/4000-is-infinite-right | Craig Tiller | 2015-07-17 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Changing a very long (4000s) deadline to 10s. |