Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Revert bad changes to grpc.podspec | Craig Tiller | 2016-08-04 |
* | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-04 |
|\ | |||
| * | Commit as 1.0.0-pre1 so we can release already. | Jorge Canizales | 2016-07-18 |
| * | We’re done with the underscore tags for good! | Jorge Canizales | 2016-07-18 |
| * | Advance versions from 0.14 -> 1.0 | Jorge Canizales | 2016-07-15 |
* | | Merge branch 'delayed-write' into grand-unified-closures | Craig Tiller | 2016-07-13 |
|\| | |||
| * | gRPC.podspec shouldn't be a template anymore. | Nicolas "Pixel" Noble | 2016-07-12 |
* | | Merge branch 'delayed-write' into grand-unified-closures | Craig Tiller | 2016-07-12 |
|\ \ | |||
| * | | Merge branch 'release-0_15' into upmerge-master | Nicolas "Pixel" Noble | 2016-07-12 |
| |\| | |||
* | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-07-08 |
|\| | | |||
* | | | Rename async_execution_lock --> combiner, make it use closures, unroll previo... | Craig Tiller | 2016-07-07 |
* | | | Merge github.com:grpc/grpc into atm2 | Craig Tiller | 2016-07-07 |
|\ \ \ | |||
| | * | | Merge fixup: version, deployment target & spec name | Jorge Canizales | 2016-07-01 |
| | * | | Merge master into merge-0.14-into-master | Jorge Canizales | 2016-06-30 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-27 |
| |\ \ \ | |||
| | * \ \ | Merge pull request #6973 from makdharma/network_status_change | Jan Tattermusch | 2016-06-27 |
| | |\ \ \ | |||
| | * \ \ \ | Merge branch 'master' into epoll_changes_merged | Sree Kuchibhotla | 2016-06-21 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||
| | | | * | | more files after running build.yaml changes through | Makarand Dharmapurikar | 2016-06-20 |
| | | |/ / | |||
| * | | | | Resolved merge conflicts with master | murgatroid99 | 2016-06-20 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| | | * | | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-16 |
| | | |\ \ | |||
| * | | | | | Allow disabling traces, add trace variables for pluck and timeout events | murgatroid99 | 2016-06-15 |
| | |_|/ / | |/| | | | |||
| | * | | | 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 branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-09 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-09 |
| | | |\ \ \ | | | |/ / / | | |/| | | | |||
| | | | | * | Separate Core, ProtoRuntime, and RxLibrary subspecs | Jorge Canizales | 2016-06-08 |
| | * | | | | Merge pull request #6481 from dgquintas/compression_md_level_bis | Jan Tattermusch | 2016-06-08 |
| | |\ \ \ \ | |||
| * | \ \ \ \ | Merge remote-tracking branch 'upstream/master' into base64_decode | Yuchen Zeng | 2016-06-08 |
| |\ \ \ \ \ \ | |||
| | | | | | * \ | Merge branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-08 |
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | |||
| | | | * | | | | Merge branch 'master' of github.com:grpc/grpc into compression_md_level_bis | David Garcia Quintas | 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 github.com:grpc/grpc into error | Craig Tiller | 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 branch 'master' into epoll_changes | Sree Kuchibhotla | 2016-06-06 |
| | | | | | | |\ \ | | | | |_|_|_|/ / | | | |/| | | | | | |||
| | | | | | | * | | Remove unused files | Sree Kuchibhotla | 2016-06-06 |
| | | | | | * | | | Merge github.com:grpc/grpc into error | Craig Tiller | 2016-06-06 |
| | | | | | |\ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||
| | | | | * | | | | 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 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / | | | |/| | | | | | | | |