Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge with head | yang-g | 2015-07-16 |
|\ | |||
* | | split iterator into its own file | yang-g | 2015-07-16 |
| | | |||
| * | Change name of thread_pool files to fixed_size_thread_pool when | vjpai | 2015-07-15 |
| | | | | | | | | appropriate | ||
| * | Make thread_pool.h a public header | Vijay Pai | 2015-07-15 |
|/ | | | | | Rename ThreadPool -> FixedSizeThreadPool to allow for later introduction of DynamicSizeThreadPool | ||
* | merge with upstream and resolve conflicts | yang-g | 2015-07-06 |
|\ | |||
* | | compiles | yang-g | 2015-07-06 |
| | | |||
| * | Merge github.com:grpc/grpc into are-includes-sane | Craig Tiller | 2015-06-25 |
| |\ | | | | | | | | | | | | | Conflicts: tools/doxygen/Doxyfile.c++.internal | ||
| * | | Add a test that headers are properly in build.json | Craig Tiller | 2015-06-25 |
| | | | | | | | | | | | | Clean up anything that failed | ||
| | * | Make it less likely a build.json change triggers a merge conflict | Craig Tiller | 2015-06-23 |
| |/ | |||
| * | Add missing headers to build.json | yang-g | 2015-06-23 |
| | | |||
* | | Merge github.com:grpc/grpc into you-complete-me | Craig Tiller | 2015-06-05 |
|\ \ | |||
| | * | Add missing file to build.json | Craig Tiller | 2015-06-05 |
| | | | |||
| | * | Merge branch 'there-is-a-place-for-everything-and-the-old-place-was-wrong' ↵ | Craig Tiller | 2015-06-05 |
| | |\ | | |/ | |/| | | | | into one-shouldnt-depend-on-protobufs | ||
| * | | Get internal documentation generated in the right place | Craig Tiller | 2015-06-05 |
| | | | |||
| | * | Progress commit on fixing up C++ | Craig Tiller | 2015-06-04 |
| | | | |||
| | * | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-06-04 |
| | |\ | | |/ | |/| | | | | | | | Conflicts: tools/doxygen/Doxyfile.core.internal | ||
* | | | Merge github.com:grpc/grpc into you-complete-me | Craig Tiller | 2015-06-04 |
|\| | | |||
| * | | Add ability to override default thread pool | Yang Gao | 2015-06-03 |
| | | | |||
* | | | Merge github.com:grpc/grpc into you-complete-me | Craig Tiller | 2015-06-01 |
|/ / | |||
| * | Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup | Craig Tiller | 2015-05-30 |
|/ | | | | | | | | | | | | Conflicts: Makefile build.json src/core/security/credentials.c src/core/security/credentials.h src/core/surface/call.c test/core/end2end/tests/request_response_with_payload_and_call_creds.c tools/doxygen/Doxyfile.c++ tools/doxygen/Doxyfile.core | ||
* | Tagging 0.9.1 on master. | Nicolas "Pixel" Noble | 2015-05-30 |
| | |||
* | Add doxygen setups for internal documentation | Craig Tiller | 2015-05-29 |