Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Fixes | Craig Tiller | 2017-10-06 |
| | |||
* | Merge github.com:grpc/grpc into flowctl+millis | Craig Tiller | 2017-10-05 |
|\ | |||
* \ | Merge github.com:grpc/grpc into flowctl+millis | Craig Tiller | 2017-10-05 |
|\ \ | |||
| | * | Merge branch 'master' into externC | Yash Tibrewal | 2017-10-03 |
| | |\ | | |/ | |/| | |||
| * | | Merge pull request #12690 from matt-kwong/cov | Matt Kwong | 2017-10-03 |
| |\ \ | | | | | | | | | Fix coverage tests | ||
| | | * | Rebasing on master for easier merging and testing | Yash Tibrewal | 2017-10-02 |
| | | | | |||
| | | * | Trying ken's fix for windows python | Yash Tibrewal | 2017-10-02 |
| | | | | |||
| | | * | Running generate projects | Yash Tibrewal | 2017-10-02 |
| | | | | |||
| | | * | Reverting pb.c files for now. Also fixing few more build errors | Yash Tibrewal | 2017-10-02 |
| | | | | |||
| | | * | Running generate_projects.sh and solving some uv build errors | Yash Tibrewal | 2017-10-02 |
| | | | | |||
| | | * | Changes for C to C++. Adding extern C to header files for compatibility. | Yash Tibrewal | 2017-10-02 |
| | | | | | | | | | | | | | | | | Also converting to .cc | ||
| | | * | Changes for C to C++. Adding extern C to header files for compatibility. | Yash Tibrewal | 2017-10-02 |
| | |/ | |/| | |||
* | | | Merge github.com:grpc/grpc into flowctl+millis | Craig Tiller | 2017-09-29 |
|\| | | |||
| | * | Add -lstdc++ flag for compiling under gcov | Matt Kwong | 2017-09-21 |
| | | | |||
| * | | Merge remote-tracking branch 'upstream/master' into ↵ | Muxi Yan | 2017-09-11 |
| |\| | | | | | | | | | | fix-stream-compression-transport-duplicate | ||
* | | | Merge | Craig Tiller | 2017-09-08 |
|\ \ \ | | |/ | |/| | |||
| * | | Merge pull request #12200 from dgquintas/rename_lr_to_plugin | David G. Quintas | 2017-09-08 |
| |\ \ | | | | | | | | | Renamed load_reporting.{c,h} to load_reporting_plugin.{c,h} | ||
| | * \ | Merge branch 'master' of github.com:grpc/grpc into rename_lr_to_plugin | David Garcia Quintas | 2017-09-07 |
| | |\ \ | |||
| * | \ \ | Merge github.com:grpc/grpc into stats_histo | Craig Tiller | 2017-09-07 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
* | | | | | Merge github.com:grpc/grpc into grpc_millis | Craig Tiller | 2017-09-07 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #12369 from markdroth/call_combiner | Mark D. Roth | 2017-09-07 |
| |\ \ \ \ | | | | | | | | | | | | | Second attempt at call combiner PR | ||
| | | * \ \ | Merge github.com:grpc/grpc into stats_histo | Craig Tiller | 2017-09-07 |
| | | |\ \ \ | | |_|/ / / | |/| | | | | |||
| * | | | | | Garbage collect experimental pollers | Craig Tiller | 2017-09-07 |
| | | | | | | |||
| | | | * | | s/load_reporting/server_load_reporting | David Garcia Quintas | 2017-09-06 |
| | | | | | | |||
| | | | | * | build_project | Muxi Yan | 2017-09-05 |
| | |_|_|/ | |/| | | | |||
* | | | | | Merge github.com:grpc/grpc into wc | Craig Tiller | 2017-09-01 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Revert "Revert "Implement call combiner"" | Mark D. Roth | 2017-09-01 |
| |/ / / | | | | | | | | | | | | | This reverts commit bf19961d0a49b43cb528392efeb4880eeebb9b5e. | ||
| | * / | Expose stats into qps_driver | Craig Tiller | 2017-08-31 |
| |/ / | |||
| * | | Merge github.com:grpc/grpc into stats | Craig Tiller | 2017-08-31 |
| |\ \ | |||
| | * | | Revert "Implement call combiner" | Mark D. Roth | 2017-08-29 |
| | | | | |||
| * | | | Merge github.com:grpc/grpc into stats | Craig Tiller | 2017-08-29 |
| |\| | | |||
* | | | | Merge github.com:grpc/grpc into grpc_millis | Craig Tiller | 2017-08-29 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||
| * | | Implement call combiner. | Mark D. Roth | 2017-08-25 |
| | | | |||
| | * | Renamed load_reporting.{c,h} to load_reporting_plugin.{c,h} | David Garcia Quintas | 2017-08-24 |
| |/ | |||
| * | generate_project and clang_format | Muxi Yan | 2017-08-21 |
| | | |||
| * | Regenerated grpc.gyp with grrpc/third_party dependencies. | Maxim Dzoba | 2017-08-16 |
| | | |||
| * | Adding a build template for generic GYP build. | Maxim Dzoba | 2017-08-16 |
|/ | |||
* | Consolidated gyp files to fix Node installation issue | murgatroid99 | 2015-10-09 |
| | |||
* | Resolved merge conflicts in grpc.gyp | murgatroid99 | 2015-10-05 |
|\ | |||
* | | Removed spurious comment from grpc.gyp | murgatroid99 | 2015-10-05 |
| | | |||
| * | Restore build sanity | Craig Tiller | 2015-10-05 |
| | | |||
* | | Removed most of the gyp file, and the tests for it | murgatroid99 | 2015-10-01 |
| | | | | | | | | | | There seems to be a bug in node-gyp (nodejs/node-gyp#752) that prevents it from working properly with other gyp files. | ||
* | | Moved gRPC node package root to repo root, made it depend on grpc.gyp | murgatroid99 | 2015-10-01 |
|/ | |||
* | Merge with gyp changes | Craig Tiller | 2015-09-23 |
| | |||
* | Regenerated gyp file | murgatroid99 | 2015-09-22 |
| | |||
* | Fixed TODO comment | murgatroid99 | 2015-09-21 |
| | |||
* | Added check for OpenSSL version | murgatroid99 | 2015-09-21 |
| | |||
* | Removed C++ build from gyp file, fixed some minor issues | murgatroid99 | 2015-09-21 |
| | |||
* | Added grpc.gyp template | murgatroid99 | 2015-09-21 |