Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge branch 'idempotent_endpoint_shutdown' into handshake_timeout | Craig Tiller | 2016-06-15 |
|\ | |||
| * | Merge remote-tracking branch 'upstream/master' into base64_decode | Yuchen Zeng | 2016-06-09 |
| |\ | |||
* | \ | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-09 |
|\ \ \ | | |/ | |/| | |||
| * | | Merge pull request #6481 from dgquintas/compression_md_level_bis | Jan Tattermusch | 2016-06-08 |
| |\ \ | |||
| * \ \ | Merge pull request #6610 from xyzzyz/external_fd_fresh | Jan Tattermusch | 2016-06-08 |
| |\ \ \ | |||
| | | | * | Merge remote-tracking branch 'upstream/master' into base64_decode | Yuchen Zeng | 2016-06-08 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | * | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | David Garcia Quintas | 2016-06-07 |
| | | |\ \ | |||
| * | | \ \ | Merge branch 'master' of github.com:grpc/grpc into core_codegen_be_public | David Garcia Quintas | 2016-06-07 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | Add C++ support for using external FD | Adam Michalik | 2016-06-07 |
| | | * | | | implement support for adding external fd to server | Adam Michalik | 2016-06-07 |
| | | * | | | separate posix functionality to grpc_posix.h | Adam Michalik | 2016-06-07 |
| | |/ / / | |||
* | | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-07 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #6190 from dgquintas/lb_pollset_propagation | Jan Tattermusch | 2016-06-07 |
| |\ \ \ \ | |||
* | | | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-07 |
|\| | | | | | |||
| * | | | | | Merge pull request #6792 from yang-g/build_clean | Jan Tattermusch | 2016-06-07 |
| |\ \ \ \ \ | |||
| | | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-06-06 |
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #6750 from makdharma/cronet | Jan Tattermusch | 2016-06-06 |
| |\ \ \ \ \ \ | |||
* | | | | | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-06 |
|\| | | | | | | | |||
| | | * | | | | | merge and resolve conflicts | yang-g | 2016-06-03 |
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | | * | | | | | Make grpc++ independent of protobuf | yang-g | 2016-06-03 |
| | | | | | * | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | David Garcia Quintas | 2016-06-03 |
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #6306 from y-zeng/win32_suffix | Jan Tattermusch | 2016-06-03 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-06-02 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||
| | | | * | | | | | incremental fix - removed cronet dependency from grpc_secure | Makarand Dharmapurikar | 2016-06-01 |
| | | | * | | | | | cronet build related changes | Makarand Dharmapurikar | 2016-06-01 |
| | | |/ / / / / | | |/| | | | | | |||
* | | | | | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-01 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| * | | | | | | | Merge pull request #6702 from a-veitch/add_proto | Jan Tattermusch | 2016-06-01 |
| |\ \ \ \ \ \ \ | |||
* | | | | | | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-01 |
|\| | | | | | | | | |||
| | | | | * | | | | s/grpc_pops/grpc_polling_entity | David Garcia Quintas | 2016-05-31 |
| | | | * | | | | | Merge remote-tracking branch 'upstream/master' into base | Yuchen Zeng | 2016-05-31 |
| | | | |\ \ \ \ \ | |||
| | | | | | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-05-31 |
| | | | | | |\ \ \ \ | | | | | | |/ / / / | | | | | |/| | | | | |||
| * | | | / | | | | | Revert "Remove legacy poller" | Craig Tiller | 2016-05-31 |
| | |_|_|/ / / / / | |/| | | | | | | | |||
| | * | | | | | | | Merge branch 'master' into add_proto | Alistair Veitch | 2016-05-24 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||
* | | | | | | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-05-24 |
|\| | | | | | | | | |||
| * | | | | | | | | Merge github.com:grpc/grpc into test_affine | Craig Tiller | 2016-05-23 |
| |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | end-to-end compilation | Alistair Veitch | 2016-05-23 |
| * | | | | | | | | | Remove legacy poller | Craig Tiller | 2016-05-20 |
| | |/ / / / / / / | |/| | | | | | | | |||
| | | * | | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_hook | David Garcia Quintas | 2016-05-19 |
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||
| | | | | | * | | | moved core_codegen from src/cpp/... to include/grpc++/... | David Garcia Quintas | 2016-05-19 |
| | |_|_|_|/ / / | |/| | | | | | | |||
| | * | | | | | | Merge branch 'master' of github.com:grpc/grpc into credentials_refactoring | Julien Boeuf | 2016-05-18 |
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||
| | | | | | * | | Merge branch 'compression_incoming_checks' into compression_md_level_bis | David Garcia Quintas | 2016-05-18 |
| | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Move load_file into iomgr | Craig Tiller | 2016-05-18 |
| | | | | * | | Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation | David Garcia Quintas | 2016-05-18 |
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | | | |||
* | | | | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-05-13 |
|\| | | | | | | |||
| * | | | | | | Merge pull request #5456 from ctiller/cleaner-posix3 | Jan Tattermusch | 2016-05-13 |
| |\ \ \ \ \ \ | |||
| | | | | | | * | Add base64 decoder | Yuchen Zeng | 2016-05-12 |
* | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into merge | David Garcia Quintas | 2016-05-12 |
|\| | | | | | | | |||
| * | | | | | | | Merge pull request #6553 from grpc/revert-6488-revert-6214-master | Jan Tattermusch | 2016-05-12 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||
* | | | | | | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-05-12 |
|\| | | | | | | | |||
| * | | | | | | | Merge pull request #6373 from y-zeng/server-builder-plugin | Yuchen Zeng | 2016-05-11 |
| |\ \ \ \ \ \ \ |