aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Resolved merge conflicts with masterGravatar murgatroid992016-06-20
|\
| * Merge pull request #6957 from ctiller/cpu_costGravatar Jan Tattermusch2016-06-17
| |\
| * \ Merge pull request #6958 from ctiller/cpuburnGravatar Jan Tattermusch2016-06-17
| |\ \
| * \ \ Merge pull request #6352 from ctiller/errorGravatar Jan Tattermusch2016-06-17
| |\ \ \
| * \ \ \ Merge pull request #6863 from vjpai/wheezyGravatar Jan Tattermusch2016-06-17
| |\ \ \ \
| | | | * | Reduce cost of some heavyweight testsGravatar Craig Tiller2016-06-17
| | |_|/ / | |/| | |
| | | | * Adjust cpu_cost of some tests to better reflect realityGravatar Craig Tiller2016-06-17
| | | | * Adjust cpu_cost of some tests to better reflect realityGravatar Craig Tiller2016-06-17
| | |_|/ | |/| |
| | | * Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-17
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #6911 from ctiller/idempotent_endpoint_shutdownGravatar Jan Tattermusch2016-06-17
| |\ \ \
| | | | * Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-17
| | | | |\ | | |_|_|/ | |/| | |
| | | | * clang-format codeGravatar Craig Tiller2016-06-17
| * | | | Merge pull request #6631 from stanley-cheung/php-custom-metadata-interopGravatar Jan Tattermusch2016-06-17
| |\ \ \ \
| | | | * | Stop using global namespace on a template paramGravatar vjpai2016-06-17
| | | | * | Merge branch 'wheezy' of github.com:vjpai/grpc into wheezyGravatar vjpai2016-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
| | | | | |\ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge pull request #6952 from jtattermusch/bump_protobuf_300_beta32Gravatar Jan Tattermusch2016-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 e...Gravatar Craig Tiller2016-06-17
| | | | | | | | |\
| | | | | | | | * | Merge github.com:grpc/grpc into errorGravatar Craig Tiller2016-06-17
| | | | | | | |/| | | | |_|_|_|_|_|/ / | |/| | | | | | |
| | | * | | | | | php: run advanced interop testsGravatar Stanley Cheung2016-06-17
| | | * | | | | | php: implement 2 more interop testsGravatar Stanley Cheung2016-06-17
| | | * | | | | | php: implement custom_metadata interop testGravatar Stanley Cheung2016-06-17
| | |/ / / / / / | |/| | | | | |
| | * | | | | | update third_party/protobuf to v3.0.0-beta-3.2Gravatar Jan Tattermusch2016-06-17
| |/ / / / / /
| * | | | | | Merge pull request #6944 from nathanielmanistaatgoogle/fatal_failure→shutdownGravatar Jan Tattermusch2016-06-17
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #6902 from sreecha/php_stress_testGravatar Jan Tattermusch2016-06-17
| |\ \ \ \ \ \ \
| | | | | | | | * Node QPS worker: wait for clients to be ready before making callsGravatar murgatroid992016-06-17
| * | | | | | | | Merge pull request #6926 from vjpai/clang34Gravatar Jan Tattermusch2016-06-17
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge pull request #6917 from ctiller/poller_restrictionsGravatar Jan Tattermusch2016-06-17
| |\ \ \ \ \ \ \ \
| | | | | | | | * | clang-format changesGravatar Vijay Pai2016-06-17
| * | | | | | | | | Merge pull request #6916 from ctiller/faster_tsanGravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #6838 from vjpai/trigger_happyGravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #6858 from makdharma/issue5851Gravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6905 from makdharma/2868Gravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6943 from kpayson64/python_qps_waitGravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #5256 from tamihiro/masterGravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #6938 from nathanielmanistaatgoogle/__all__Gravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge pull request #6882 from kpayson64/python_metadata_testsGravatar Jan Tattermusch2016-06-16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | More formatting fixesGravatar murgatroid992016-06-16
* | | | | | | | | | | | | | | | | Clang formatGravatar murgatroid992016-06-16
| | | | | | | | | | | | | | * | | Don't global initialize anything to nullptrGravatar vjpai2016-06-16
| | | | | | | | | | | | | | |/ /