Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
|\ | |||
| * | Merge pull request #6957 from ctiller/cpu_cost | Jan Tattermusch | 2016-06-17 |
| |\ | |||
| * \ | Merge pull request #6958 from ctiller/cpuburn | Jan Tattermusch | 2016-06-17 |
| |\ \ | |||
| * \ \ | Merge pull request #6352 from ctiller/error | Jan Tattermusch | 2016-06-17 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #6863 from vjpai/wheezy | Jan Tattermusch | 2016-06-17 |
| |\ \ \ \ | |||
| | | | * | | Reduce cost of some heavyweight tests | Craig Tiller | 2016-06-17 |
| | |_|/ / | |/| | | | |||
| | | | * | Adjust cpu_cost of some tests to better reflect reality | Craig Tiller | 2016-06-17 |
| | | | * | Adjust cpu_cost of some tests to better reflect reality | Craig Tiller | 2016-06-17 |
| | |_|/ | |/| | | |||
| | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-17 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #6911 from ctiller/idempotent_endpoint_shutdown | Jan Tattermusch | 2016-06-17 |
| |\ \ \ | |||
| | | | * | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-17 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | | * | clang-format code | Craig Tiller | 2016-06-17 |
| * | | | | Merge pull request #6631 from stanley-cheung/php-custom-metadata-interop | Jan Tattermusch | 2016-06-17 |
| |\ \ \ \ | |||
| | | | * | | Stop using global namespace on a template param | vjpai | 2016-06-17 |
| | | | * | | Merge branch 'wheezy' of github.com:vjpai/grpc into wheezy | vjpai | 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 |
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #6952 from jtattermusch/bump_protobuf_300_beta32 | Jan Tattermusch | 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 e... | Craig Tiller | 2016-06-17 |
| | | | | | | | |\ | |||
| | | | | | | | * | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-17 |
| | | | | | | |/| | | | |_|_|_|_|_|/ / | |/| | | | | | | | |||
| | | * | | | | | | php: run advanced interop tests | Stanley Cheung | 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 |
| | |/ / / / / / | |/| | | | | | | |||
| | * | | | | | | update third_party/protobuf to v3.0.0-beta-3.2 | Jan Tattermusch | 2016-06-17 |
| |/ / / / / / | |||
| * | | | | | | Merge pull request #6944 from nathanielmanistaatgoogle/fatal_failure→shutdown | Jan Tattermusch | 2016-06-17 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge pull request #6902 from sreecha/php_stress_test | Jan Tattermusch | 2016-06-17 |
| |\ \ \ \ \ \ \ | |||
| | | | | | | | * | Node QPS worker: wait for clients to be ready before making calls | murgatroid99 | 2016-06-17 |
| * | | | | | | | | Merge pull request #6926 from vjpai/clang34 | Jan Tattermusch | 2016-06-17 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||
| * | | | | | | | | Merge pull request #6917 from ctiller/poller_restrictions | Jan Tattermusch | 2016-06-17 |
| |\ \ \ \ \ \ \ \ | |||
| | | | | | | | * | | clang-format changes | Vijay Pai | 2016-06-17 |
| * | | | | | | | | | Merge pull request #6916 from ctiller/faster_tsan | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #6838 from vjpai/trigger_happy | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ | Merge pull request #6858 from makdharma/issue5851 | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6905 from makdharma/2868 | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6943 from kpayson64/python_qps_wait | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #5256 from tamihiro/master | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #6938 from nathanielmanistaatgoogle/__all__ | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | Merge pull request #6882 from kpayson64/python_metadata_tests | Jan Tattermusch | 2016-06-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |||
| | | * | | | | | | | | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | | | | | | More formatting fixes | murgatroid99 | 2016-06-16 |
* | | | | | | | | | | | | | | | | | Clang format | murgatroid99 | 2016-06-16 |
| | | | | | | | | | | | | | * | | | Don't global initialize anything to nullptr | vjpai | 2016-06-16 |
| | | | | | | | | | | | | | |/ / |