Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #11309 from murgatroid99/master_1.3.x_upmerge | Michael Lumish | 2017-05-30 |
|\ | |||
| * | get rid of flakey asserts in num_watchers test | Alexander Polcyn | 2017-05-26 |
* | | add missing copyright headers | Alexander Polcyn | 2017-05-25 |
| * | Fix concurrent_connectivity_test | murgatroid99 | 2017-05-25 |
| * | Merge remote-tracking branch 'upstream/v1.3.x' into master_1.3.x_upmerge | murgatroid99 | 2017-05-25 |
| |\ | |||
* | | | update | Vizerai | 2017-05-23 |
* | | | Merge branch 'master' of https://github.com/Vizerai/grpc into intrusive_hash_map | Vizerai | 2017-05-23 |
|\| | | |||
| * | | Change round_robin LB policy to use the addresses in the order given. | Mark D. Roth | 2017-05-19 |
| * | | Merge pull request #10930 from ncteisen/frame-size | Noah Eisen | 2017-05-18 |
| |\ \ | |||
| * \ \ | Merge pull request #11229 from muxi/backward-compat-import-fix | Muxi Yan | 2017-05-18 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #11191 from ctiller/hospital_food | Craig Tiller | 2017-05-18 |
| |\ \ \ \ | |||
| | | * | | | Remove loop initial declaration | Muxi Yan | 2017-05-18 |
| | | | | * | get rid of connectivity state watchers right after timeout | Alexander Polcyn | 2017-05-18 |
| * | | | | | clang-format | Craig Tiller | 2017-05-18 |
| * | | | | | Merge github.com:grpc/grpc into races | Craig Tiller | 2017-05-18 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||
| * | | | | | Fix some races in tests | Craig Tiller | 2017-05-17 |
| | | * | | | Make cq_verifier output more readable | Craig Tiller | 2017-05-17 |
| | |/ / / | |/| | | | |||
| | * | | | Implement grpclb drop support. | Mark D. Roth | 2017-05-17 |
| |/ / / | |||
| * | | | Merge pull request #11135 from ctiller/bugz | Craig Tiller | 2017-05-16 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #11138 from grpc/revert-11121-revert-10849-backward-compat | Muxi Yan | 2017-05-16 |
| |\ \ \ \ | |||
| * | | | | | fix extern c location | Yuxuan Li | 2017-05-15 |
| | * | | | | Fix bazel build | Muxi Yan | 2017-05-15 |
| * | | | | | remove unncessary include | Yuxuan Li | 2017-05-15 |
| * | | | | | merge master, resolve conflict | Yuxuan Li | 2017-05-15 |
| |\ \ \ \ \ | |||
| | | * | | | | Revert "Revert "Implement Server Backward Compatibility"" | Muxi Yan | 2017-05-15 |
| | |/ / / / | |||
| | * | | | | Merge pull request #10662 from sreecha/cq_mpsc_based | Sree Kuchibhotla | 2017-05-15 |
| | |\ \ \ \ | |||
| | | | * | | | Small fixes | Craig Tiller | 2017-05-15 |
| | * | | | | | Merge pull request #11115 from jtattermusch/revamp_artifacts | Jan Tattermusch | 2017-05-15 |
| | |\ \ \ \ \ | |||
| | * \ \ \ \ \ | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-13 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | Revert "Implement Server Backward Compatibility" | Nicolas Noble | 2017-05-12 |
| | | | |_|/ / / | | | |/| | | | | |||
| | * | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-12 |
| | |\| | | | | | |||
| | | * | | | | | Merge pull request #10849 from muxi/backward-compat | Muxi Yan | 2017-05-12 |
| | | |\ \ \ \ \ | |||
| | * | | | | | | | Fixing mock test target. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | * | | | | | | Merge pull request #11102 from ctiller/clang5 | Craig Tiller | 2017-05-12 |
| | | |\ \ \ \ \ \ | |||
| | * | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-12 |
| | |\| | | | | | | | |||
| | * | | | | | | | | Merge failure, removed test still here. | Nicolas "Pixel" Noble | 2017-05-12 |
| | * | | | | | | | | Merge failure, missing commas. | Nicolas "Pixel" Noble | 2017-05-12 |
| | * | | | | | | | | Merge failure - missing comma in deps list. | Nicolas "Pixel" Noble | 2017-05-12 |
| | * | | | | | | | | Merge failure - duplicated fake_resolver target. | Nicolas "Pixel" Noble | 2017-05-12 |
| | * | | | | | | | | Merge failure - missing grpc_cc_binary. | Nicolas "Pixel" Noble | 2017-05-12 |
| | | | | | * | | | | Run mac and windows distribtests in workspace | Jan Tattermusch | 2017-05-12 |
| | | | | * | | | | | Fix portability | Muxi Yan | 2017-05-11 |
| | | * | | | | | | | Propagate deadline to GenericServerContext | yang-g | 2017-05-11 |
| | | | |_|/ / / / | | | |/| | | | | | |||
| | | | * | | | | | just use char* overload | Craig Tiller | 2017-05-11 |
| | | | * | | | | | Explicitly mention std::string | Craig Tiller | 2017-05-11 |
| | | |/ / / / / | |||
| | * | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into import | Nicolas "Pixel" Noble | 2017-05-11 |
| | |\| | | | | | |||
| | | | | * | | | Merge branch 'master' into cq_mpsc_based | Sree Kuchibhotla | 2017-05-11 |
| | | | | |\ \ \ | | | | |_|/ / / | | | |/| | | | | |||
| | | * | | | | | Merge pull request #11074 from ctiller/pump | Craig Tiller | 2017-05-11 |
| | | |\ \ \ \ \ | |||
| | | * \ \ \ \ \ | Merge pull request #11010 from ctiller/uberpoll | Craig Tiller | 2017-05-11 |
| | | |\ \ \ \ \ \ | |||
| | | | * | | | | | | Always receive initial metadata in this test | Craig Tiller | 2017-05-11 |