Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #8069 from grpc/revert-8068-revert-7279-grand-unified-clos... | Craig Tiller | 2016-09-16 |
|\ | |||
* \ | Merge pull request #7559 from dgquintas/codegen_cleanse | Craig Tiller | 2016-09-13 |
|\ \ | |||
| | * | Revert "Revert "Grand unified closures"" | Craig Tiller | 2016-09-12 |
| |/ |/| | |||
* | | Revert "Grand unified closures" | Craig Tiller | 2016-09-12 |
* | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-07 |
|\ \ | |||
| * \ | Merge pull request #7774 from ctiller/percent-encoder | Craig Tiller | 2016-09-06 |
| |\ \ | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-09-03 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #7758 from apolcyn/use_third_party_thread_pool_master | kpayson64 | 2016-09-02 |
| |\ \ \ | |||
* | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-02 |
|\| | | | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-09-02 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #7943 from markdroth/client_channel_cleanup | Mark D. Roth | 2016-09-01 |
| |\ \ \ \ | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-09-01 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | * | | | | Move subchannel_call_holder code into client_channel module. | Mark D. Roth | 2016-08-31 |
| * | | | | | add trace context proto | Alistair Veitch | 2016-08-31 |
| |/ / / / | |||
* | | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-30 |
|\| | | | | |||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-30 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #7839 from markdroth/rename_client_config | Mark D. Roth | 2016-08-29 |
| |\ \ \ \ | |||
| | * | | | | Rename grpc_client_config to grpc_resolver_result. | Mark D. Roth | 2016-08-22 |
| * | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc | Nicolas "Pixel" Noble | 2016-08-20 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | | | * | | Percent encoding routines | Craig Tiller | 2016-08-18 |
| | * | | | | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure. | Nicolas "Pixel" Noble | 2016-08-17 |
| | | * | | | Use thread pool from concurrent-ruby on ruby server | Alexander Polcyn | 2016-08-16 |
| | | |/ / | |||
| * | / / | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-08-16 |
| |\| | | | | |/ / | |/| | | |||
* | | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-08-04 |
|\| | | | |||
| * | | | Merge pull request #7370 from rjshade/move_timeout_encoding | kpayson64 | 2016-08-02 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #6774 from a-veitch/add_resource | kpayson64 | 2016-08-02 |
| |\ \ \ \ | |||
| | | | | * | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-02 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | | | | * | added gpr_types.h | David Garcia Quintas | 2016-08-01 |
| * | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-08-01 |
| |\ \ \ \ \ | |||
| | | | | * | | Update ruby google-protobuf dependency to 3.0 | murgatroid99 | 2016-07-29 |
| | | | | | * | removed codegen/slice_buffer.h and scrubbed codegen/slice.h | David Garcia Quintas | 2016-07-27 |
| | | | | | * | removed codegen/log.h | David Garcia Quintas | 2016-07-27 |
| | | | | | * | removed codegen/time.h | David Garcia Quintas | 2016-07-27 |
| | | | | | * | removed codegen/byte_buffer.h | David Garcia Quintas | 2016-07-27 |
| | | | | | * | removed codegen/alloc.h | David Garcia Quintas | 2016-07-27 |
| | | |_|_|/ | | |/| | | | |||
| | | | * | | Merge branch 'master' into move_timeout_encoding | Robbie Shade | 2016-07-26 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | merge to upstream/master | Alistair Veitch | 2016-07-21 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||
| * | | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-07-14 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | Added handshaker.[ch] to build.yaml. | Mark D. Roth | 2016-07-14 |
| | |/ / / | |||
| | | | * | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transport | Robbie Shade | 2016-07-13 |
| | | |/ | | |/| | |||
* | | | | 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 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | 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 |
| | |\ \ \ \ | |||
| | | | | * \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0 | David Garcia Quintas | 2016-06-20 |
| | | | | |\ \ | | | | |_|/ / | | | |/| | | | |||
| | | | * | | | 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 |
| | | |\ \ \ | |||
| | | | | * | | added missing grpclb.h dep in build.yaml | David Garcia Quintas | 2016-06-15 |