aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAge
* Resolved merge conflicts with masterGravatar murgatroid992016-06-20
|\
| * Merge pull request #6352 from ctiller/errorGravatar Jan Tattermusch2016-06-17
| |\ | | | | | | Unifying error handling within core
| * \ Merge pull request #6863 from vjpai/wheezyGravatar Jan Tattermusch2016-06-17
| |\ \ | | | | | | | | Make C++ compile and run under gcc-4.4
| * \ \ Merge pull request #6911 from ctiller/idempotent_endpoint_shutdownGravatar Jan Tattermusch2016-06-17
| |\ \ \ | | | | | | | | | | Idempotent endpoint shutdown
| | | | * Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-17
| | | | |\ | | |_|_|/ | |/| | |
| | | | * clang-format codeGravatar Craig Tiller2016-06-17
| | | | |
| | | | * Merge branch 'error' of github.com:ctiller/grpc into errorGravatar Craig Tiller2016-06-17
| | | | |\
| | | | * | Cleanup spamGravatar Craig Tiller2016-06-17
| | | | | |
| | | * | | Merge branch 'master' into wheezyGravatar Vijay Pai2016-06-17
| | | |\ \ \
| * | | | | | php: there is an unimplemented serviceGravatar Stanley Cheung2016-06-17
| | | | | | |
| | | | | | * Merge branch 'node_qps_wait_for_ready' of github.com:murgatroid99/grpc into ↵Gravatar Craig Tiller2016-06-17
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | error
| | | | | | * | Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-17
| | | | | |/| | | | | | | |/ / | | | | |/| |
| * | | | | | php: implement 2 more interop testsGravatar Stanley Cheung2016-06-17
| | | | | | |
| * | | | | | php: implement custom_metadata interop testGravatar Stanley Cheung2016-06-17
| | |_|/ / / | |/| | | |
| * | | | | Merge pull request #6944 from nathanielmanistaatgoogle/fatal_failure→shutdownGravatar Jan Tattermusch2016-06-17
| |\ \ \ \ \ | | | | | | | | | | | | | | Rename FATAL_FAILURE SHUTDOWN
| * \ \ \ \ \ Merge pull request #6902 from sreecha/php_stress_testGravatar Jan Tattermusch2016-06-17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | PHP stress client in stress test framework
| | | | | | | * Node QPS worker: wait for clients to be ready before making callsGravatar murgatroid992016-06-17
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #6905 from makdharma/2868Gravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixes #2868
| * \ \ \ \ \ \ Merge pull request #6943 from kpayson64/python_qps_waitGravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Wait for channel to be connected on QPS Client
| | * | | | | | | Wait for channel to be connected for each clientGravatar Ken Payson2016-06-16
| | | | | | | | |
| | | | | * | | | Rename FATAL_FAILURE SHUTDOWNGravatar Nathaniel Manista2016-06-16
| | | | | | | | |
| | | | | | | | * Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-16
| | | | | | | | |\ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge pull request #6921 from dgquintas/fix_printf_flags_lb_policyGravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed printf/gpr_log format in lb_policy.c
| * \ \ \ \ \ \ \ \ Merge pull request #6938 from nathanielmanistaatgoogle/__all__Gravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | | grpc.__all__ definition
| * | | | | | | | | Merge pull request #6882 from kpayson64/python_metadata_testsGravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | Added Python GA API metadata tests
| | | * | | | | | | grpc.__all__ definitionGravatar Nathaniel Manista2016-06-16
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Add comment about new trace flagsGravatar murgatroid992016-06-16
| | | | | | | | |
| * | | | | | | | Merge pull request #6876 from mdyring/masterGravatar Nicolas Noble2016-06-16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix scope problem when GPR_SUPPORT_CHANNELS_FROM_FD is not defined
* | | | | | | | | | More formatting fixesGravatar murgatroid992016-06-16
| | | | | | | | | |
* | | | | | | | | | Clang formatGravatar murgatroid992016-06-16
| | | | | | | | | |
| | | | | | | | * | Remove range-based for, comparisons to nullptrGravatar Vijay Pai2016-06-16
| | | | | | | | | |
| | | | | | | | * | DigraphGravatar Vijay Pai2016-06-16
| | | | | | | | | |
| | | | | | | | * | Merge branch 'wheezy' of github.com:vjpai/grpc into wheezyGravatar Vijay Pai2016-06-16
| | | | | | | | |\ \
| | | | | | | | | * | Should not explicitly initialize these pointers to nullptr in gcc-4.4 caseGravatar Vijay Pai2016-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 wheezyGravatar Vijay Pai2016-06-15
| | | | | | | | |\ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | / / | | | | | | | | |/ /
| | | | * | | | / / Fixed printf/gpr_log format.Gravatar David Garcia Quintas2016-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 eventsGravatar murgatroid992016-06-15
|/ / / / / / / /
* | | | | | | | Merge pull request #6909 from jtattermusch/csharp_client_streamingGravatar Jan Tattermusch2016-06-15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Improve docs for IAsyncStreamReader
* \ \ \ \ \ \ \ \ Merge pull request #6908 from jtattermusch/csharp_send_completion_dedupGravatar Jan Tattermusch2016-06-15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | C#: dedup code for send finished handler
| | | | | | | | | * Fix merge errorsGravatar Craig Tiller2016-06-15
| | | | | | | | | |
| | | | | | | | | * Fix merge errorGravatar Craig Tiller2016-06-15
| | | | | | | | | |
| | | | | | | | | * Merge branch 'idempotent_endpoint_shutdown' into handshake_timeoutGravatar Craig Tiller2016-06-15
| | | | | | | | | |\ | | | | | | | | |_|/ | | | | | | | |/| |
| | | | | | | * | | Make {endpoint,fd}_shutdown idempotentGravatar Craig Tiller2016-06-15
| | | | | | | | | |
* | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵Gravatar Jan Tattermusch2016-06-15
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | manual_upmerge_0_14_to_master
| * | | | | | | | | Merge pull request #6875 from y-zeng/log_checkGravatar Jan Tattermusch2016-06-14
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add format check for gpr_log and gpr_asprintf, add gpr_strpad
| * \ \ \ \ \ \ \ \ \ Merge pull request #6900 from nathanielmanistaatgoogle/_rpc_test-future-divisionGravatar Jan Tattermusch2016-06-14
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Drop unnecessary future division import
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #6904 from ↵Gravatar Jan Tattermusch2016-06-14
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nathanielmanistaatgoogle/unimplemented-for-cardinality-violation UNIMPLEMENTED status for cardinality violation
| * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6632 from stanley-cheung/php-add-trailing-metadata-apiGravatar Jan Tattermusch2016-06-14
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP: add call getTrailingMetadata API
| | | | | | | * | | | | | | improve docs for IAsyncStreamReaderGravatar Jan Tattermusch2016-06-14
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
| | | | | | * | | | | | | deduplicate send finished handlerGravatar Jan Tattermusch2016-06-14
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | |