Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into ↵ | Mark D. Roth | 2017-01-06 |
|\ | | | | | | | revert-9063-revert-8951-revert-8949-revert-8922-slice_cleanup | ||
| * | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
| |\ | |||
* | | | Revert "Revert "Revert "Revert "Remove redundant includes from string.h and ↵ | Mark D. Roth | 2016-12-12 |
| |/ |/| | | | | | tmpfile.h"""" | ||
* | | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h""" | Craig Tiller | 2016-12-12 |
| | | |||
| * | Merge github.com:grpc/grpc into slice_with_exec_ctx | Craig Tiller | 2016-12-12 |
| |\ | |/ |/| | |||
* | | Revert "Revert "Remove redundant includes from string.h and tmpfile.h"" | Mark D. Roth | 2016-12-05 |
| | | |||
* | | Revert "Remove redundant includes from string.h and tmpfile.h" | Mark D. Roth | 2016-12-05 |
| | | |||
* | | Temporarily enable gpr_slice_* functions to not break api compatibility | Sree Kuchibhotla | 2016-12-01 |
| | | |||
| * | Fix foward declaration duplication | Craig Tiller | 2016-11-10 |
|/ | |||
* | Get user agent right | Craig Tiller | 2016-11-04 |
| | |||
* | Deprecate grpc::thread and sync in favor of std::thread,mutex,etc | Vijay Pai | 2016-11-01 |
| | |||
* | Regenerate all projects | Vijay Pai | 2016-11-01 |
| | |||
* | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 2016-10-28 |
|\ | |||
| * | BufferPool --> ResourceQuota | Craig Tiller | 2016-10-17 |
| | | |||
* | | Rename GrpcRpcManager -> ThreadManager | Sree Kuchibhotla | 2016-10-13 |
| | | |||
| * | Merge branch 'direct-calls' into buffer_pools_for_realsies | Craig Tiller | 2016-10-03 |
| |\ | |||
* | \ | Merge remote-tracking branch 'upstream/master' into rpc_mgr | Sree Kuchibhotla | 2016-10-03 |
|\ \ \ | | |/ | |/| | |||
| | * | Merge branch 'direct-calls' into buffer_pools_for_realsies | Craig Tiller | 2016-09-29 |
| | |\ | |||
| | | * | Merge github.com:grpc/grpc into direct-calls | Craig Tiller | 2016-09-29 |
| | | |\ | |||
| | * | | | Fix conflicting filename | Craig Tiller | 2016-09-28 |
| | | | | | |||
| * | | | | Merge remote-tracking branch 'google/v1.0.x' into master-upmerge-from-deep-under | Nicolas "Pixel" Noble | 2016-09-29 |
| |\ \ \ \ | |||
| | | * | | | Buffer pool C++ wrapper | Craig Tiller | 2016-09-28 |
| | | | | | | |||
| | | * | | | Buffer pools compile | Craig Tiller | 2016-09-23 |
| | | | | | | |||
| | | * | | | Merge branch 'direct-calls' into buffer_pools_for_realsies | Craig Tiller | 2016-09-22 |
| | | |\| | | |||
| | | * | | | Add buffer pools to build | Craig Tiller | 2016-09-22 |
| | |/ / / | |/| | | | |||
* | | | | | Merge branch 'master' into rpc_mgr | Sree Kuchibhotla | 2016-09-21 |
|\| | | | | |||
| | * | | | Backport of #8055 into v1.0.x. | Nicolas "Pixel" Noble | 2016-09-20 |
| | | | | | |||
| | | * | | Merge github.com:grpc/grpc into direct-calls | Craig Tiller | 2016-09-20 |
| | | |\ \ | | |_|/ / | |/| | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-19 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-16 |
| | | | |\ | |||
| * | | | \ | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-16 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||
| | * | | | | Merge pull request #8069 from ↵ | Craig Tiller | 2016-09-16 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | grpc/revert-8068-revert-7279-grand-unified-closures Revert "Revert "Grand unified closures"" | ||
| | | | | * \ | Merge github.com:grpc/grpc into direct-calls | Craig Tiller | 2016-09-16 |
| | | | | |\ \ | | | |_|_|/ / | | |/| | | | | |||
| * | | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-16 |
| |\| | | | | | |||
| | * | | | | | Merge pull request #7996 from yang-g/canonical | Yang Gao | 2016-09-15 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Add a helper to get canonical code from status | ||
| | | | | | * \ | Merge github.com:grpc/grpc into direct-calls | Craig Tiller | 2016-09-14 |
| | | | | | |\ \ | | | |_|_|_|/ / | | |/| | | | | | |||
| | * | | | | | | Merge pull request #7559 from dgquintas/codegen_cleanse | Craig Tiller | 2016-09-13 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Removed references to public APIs from codegen/ | ||
| | | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-12 |
| | | | | | | | |\ | | | |_|_|_|_|_|/ | | |/| | | | | | | |||
| | | | | * | | | | Revert "Revert "Grand unified closures"" | Craig Tiller | 2016-09-12 |
| | | |_|/ / / / | | |/| | | | | | |||
| | * | | | | | | Revert "Grand unified closures" | Craig Tiller | 2016-09-12 |
| | | | | | | | | |||
| | | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-12 |
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | | | |||
| | | | | | * | | Tie workqueue implementation to event engine | Craig Tiller | 2016-09-09 |
| | | |_|_|/ / | | |/| | | | | |||
| | | | * | | | Add a helper to get canonical code from status | yang-g | 2016-09-09 |
| | | | | | | | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into deadline_filter | Mark D. Roth | 2016-09-09 |
| | | | | | |\ | |||
| | * | | | | \ | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-08 |
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into max_send_size_filter | Mark D. Roth | 2016-09-08 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | * | | | | | | Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge | Nicolas "Pixel" Noble | 2016-09-08 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | / / | | | | |_|/ / | | | |/| | | | |||
| | | | * | | | Merge github.com:grpc/grpc into grand-unified-closures | Craig Tiller | 2016-09-07 |
| | | |/ / / | | |/| | | | |||
| | | | * | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanse | David Garcia Quintas | 2016-08-30 |
| | | | |\ \ | | | |_|/ / | | |/| | | | |||
| | | * | | | Revert change to grpc++_base uses section | murgatroid99 | 2016-08-29 |
| | | | | | |