Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
|\ | |||
| * | Merge pull request #6352 from ctiller/error | Jan Tattermusch | 2016-06-17 |
| |\ | | | | | | | Unifying error handling within core | ||
| * \ | Merge pull request #6863 from vjpai/wheezy | Jan Tattermusch | 2016-06-17 |
| |\ \ | | | | | | | | | Make C++ compile and run under gcc-4.4 | ||
| * \ \ | Merge pull request #6911 from ctiller/idempotent_endpoint_shutdown | Jan Tattermusch | 2016-06-17 |
| |\ \ \ | | | | | | | | | | | Idempotent endpoint shutdown | ||
| | | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-17 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | | * | clang-format code | Craig Tiller | 2016-06-17 |
| | | | | | |||
| | | | * | Merge branch 'error' of github.com:ctiller/grpc into error | Craig Tiller | 2016-06-17 |
| | | | |\ | |||
| | | | * | | Cleanup spam | Craig Tiller | 2016-06-17 |
| | | | | | | |||
| | | * | | | Merge branch 'master' into wheezy | Vijay Pai | 2016-06-17 |
| | | |\ \ \ | |||
| * | | | | | | php: there is an unimplemented service | Stanley Cheung | 2016-06-17 |
| | | | | | | | |||
| | | | | | * | Merge branch 'node_qps_wait_for_ready' of github.com:murgatroid99/grpc into ↵ | Craig Tiller | 2016-06-17 |
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | error | ||
| | | | | | * | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-17 |
| | | | | |/| | | | | | | |/ / | | | | |/| | | |||
| * | | | | | | php: implement 2 more interop tests | Stanley Cheung | 2016-06-17 |
| | | | | | | | |||
| * | | | | | | php: implement custom_metadata interop test | Stanley Cheung | 2016-06-17 |
| | |_|/ / / | |/| | | | | |||
| * | | | | | Merge pull request #6944 from nathanielmanistaatgoogle/fatal_failure→shutdown | Jan Tattermusch | 2016-06-17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Rename FATAL_FAILURE SHUTDOWN | ||
| * \ \ \ \ \ | Merge pull request #6902 from sreecha/php_stress_test | Jan Tattermusch | 2016-06-17 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | PHP stress client in stress test framework | ||
| | | | | | | * | Node QPS worker: wait for clients to be ready before making calls | murgatroid99 | 2016-06-17 |
| | |_|_|_|_|/ | |/| | | | | | |||
| * | | | | | | Merge pull request #6905 from makdharma/2868 | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixes #2868 | ||
| * \ \ \ \ \ \ | Merge pull request #6943 from kpayson64/python_qps_wait | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Wait for channel to be connected on QPS Client | ||
| | * | | | | | | | Wait for channel to be connected for each client | Ken Payson | 2016-06-16 |
| | | | | | | | | | |||
| | | | | * | | | | Rename FATAL_FAILURE SHUTDOWN | Nathaniel Manista | 2016-06-16 |
| | | | | | | | | | |||
| | | | | | | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-16 |
| | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #6921 from dgquintas/fix_printf_flags_lb_policy | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixed printf/gpr_log format in lb_policy.c | ||
| * \ \ \ \ \ \ \ \ | Merge pull request #6938 from nathanielmanistaatgoogle/__all__ | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | | grpc.__all__ definition | ||
| * | | | | | | | | | Merge pull request #6882 from kpayson64/python_metadata_tests | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | Added Python GA API metadata tests | ||
| | | * | | | | | | | grpc.__all__ definition | Nathaniel Manista | 2016-06-16 |
| | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Add comment about new trace flags | murgatroid99 | 2016-06-16 |
| | | | | | | | | | |||
| * | | | | | | | | Merge pull request #6876 from mdyring/master | Nicolas Noble | 2016-06-16 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix scope problem when GPR_SUPPORT_CHANNELS_FROM_FD is not defined | ||
* | | | | | | | | | | More formatting fixes | murgatroid99 | 2016-06-16 |
| | | | | | | | | | | |||
* | | | | | | | | | | Clang format | murgatroid99 | 2016-06-16 |
| | | | | | | | | | | |||
| | | | | | | | * | | Remove range-based for, comparisons to nullptr | Vijay Pai | 2016-06-16 |
| | | | | | | | | | | |||
| | | | | | | | * | | Digraph | Vijay Pai | 2016-06-16 |
| | | | | | | | | | | |||
| | | | | | | | * | | Merge branch 'wheezy' of github.com:vjpai/grpc into wheezy | Vijay Pai | 2016-06-16 |
| | | | | | | | |\ \ | |||
| | | | | | | | | * | | Should not explicitly initialize these pointers to nullptr in gcc-4.4 case | Vijay Pai | 2016-06-16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because nullptr assignment actually requires the calling of a constructor. As a result, the order in which these nullptr initializations take place is not defined with respect to other initializations. A pointer that is left without explicit initialization automatically gets nullptr anyway, so just don't explicitly initialize these. | ||
| | | | | | | | * | | | Merge branch 'master' into wheezy | Vijay Pai | 2016-06-15 |
| | | | | | | | |\ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | / / | | | | | | | | |/ / | |||
| | | | * | | | / / | Fixed printf/gpr_log format. | David Garcia Quintas | 2016-06-15 |
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The faulty line is behind a preprocessor define that isn't on by default. | ||
* / | | | | | | | | Allow disabling traces, add trace variables for pluck and timeout events | murgatroid99 | 2016-06-15 |
|/ / / / / / / / | |||
* | | | | | | | | Merge pull request #6909 from jtattermusch/csharp_client_streaming | Jan Tattermusch | 2016-06-15 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Improve docs for IAsyncStreamReader | ||
* \ \ \ \ \ \ \ \ | Merge pull request #6908 from jtattermusch/csharp_send_completion_dedup | Jan Tattermusch | 2016-06-15 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | C#: dedup code for send finished handler | ||
| | | | | | | | | * | Fix merge errors | Craig Tiller | 2016-06-15 |
| | | | | | | | | | | |||
| | | | | | | | | * | Fix merge error | Craig Tiller | 2016-06-15 |
| | | | | | | | | | | |||
| | | | | | | | | * | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | Craig Tiller | 2016-06-15 |
| | | | | | | | | |\ | | | | | | | | |_|/ | | | | | | | |/| | | |||
| | | | | | | * | | | Make {endpoint,fd}_shutdown idempotent | Craig Tiller | 2016-06-15 |
| | | | | | | | | | | |||
* | | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵ | Jan Tattermusch | 2016-06-15 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | manual_upmerge_0_14_to_master | ||
| * | | | | | | | | | Merge pull request #6875 from y-zeng/log_check | Jan Tattermusch | 2016-06-14 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add format check for gpr_log and gpr_asprintf, add gpr_strpad | ||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #6900 from nathanielmanistaatgoogle/_rpc_test-future-division | Jan Tattermusch | 2016-06-14 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Drop unnecessary future division import | ||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #6904 from ↵ | Jan Tattermusch | 2016-06-14 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nathanielmanistaatgoogle/unimplemented-for-cardinality-violation UNIMPLEMENTED status for cardinality violation | ||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6632 from stanley-cheung/php-add-trailing-metadata-api | Jan Tattermusch | 2016-06-14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP: add call getTrailingMetadata API | ||
| | | | | | | * | | | | | | | improve docs for IAsyncStreamReader | Jan Tattermusch | 2016-06-14 |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |||
| | | | | | * | | | | | | | deduplicate send finished handler | Jan Tattermusch | 2016-06-14 |
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | |