Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | 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 |
|/ | |||
* | Fix doxyfile for real | yang-g | 2015-06-23 |
| | |||
* | clang-format messed up Doxyfile.c++, restored | yang-g | 2015-06-23 |
| | |||
* | Add missing headers to build.json | yang-g | 2015-06-23 |
| | |||
* | Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs | Yang Gao | 2015-06-23 |
|\ | | | | | Remove Protobuf dependency for C++ | ||
* | | Add pollset_set.h to build.json | Jorge Canizales | 2015-06-20 |
| | | |||
| * | Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs | Craig Tiller | 2015-06-19 |
| |\ | |/ |/| | |||
* | | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-06-18 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal | ||
| * \ | Merge pull request #2104 from murgatroid99/build_json_add_missing_context.h | Nicolas Noble | 2015-06-18 |
| |\ \ | | | | | | | | | Added missing but included headers to build.json | ||
| | * | | Added missing but included headers to build.json | murgatroid99 | 2015-06-17 |
| | | | | |||
| | | * | Merge branch 'we-dont-need-no-backup' into one-shouldnt-depend-on-protobufs | Craig Tiller | 2015-06-16 |
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/grpc++/async_unary_call.h include/grpc++/config.h include/grpc++/config_protobuf.h include/grpc++/impl/service_type.h include/grpc++/stream.h src/cpp/common/call.cc | ||
* | | | | Merge branch 'you-complete-me' into we-dont-need-no-backup | Craig Tiller | 2015-06-09 |
|\| | | | |||
| * | | | Merge remote-tracking branch 'upstream/master' into you-complete-me-csharp | Jan Tattermusch | 2015-06-09 |
| |\| | | |||
| | * | | Remove non-existing file from build.json | Yang Gao | 2015-06-09 |
| | | | | |||
| | * | | Changes to byte_buffer based on comments. | David Garcia Quintas | 2015-06-08 |
| | | | | |||
| * | | | Merge github.com:grpc/grpc into you-complete-me | Craig Tiller | 2015-06-05 |
| |\| | | |||
* | | | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 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 |
| | |\ | | |/ | |/| | |||
| * | | Merge pull request #1894 from yang-g/create-thread-pool | Nicolas Noble | 2015-06-03 |
| |\ \ | | | | | | | | | Add ability to override default thread pool | ||
| * | | | Expose gpr_asprintf and gpr_strdup | Masood Malekghassemi | 2015-06-03 |
| | | | | |||
| | * | | 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-02 |
| | |\ | | |/ | |/| | | | | | | | | | | Conflicts: src/core/iomgr/resolve_address_posix.c src/core/surface/server.c | ||
* | | | Merge branch 'count-the-things' into we-dont-need-no-backup | Craig Tiller | 2015-06-01 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile src/core/iomgr/pollset_posix.c src/core/surface/call.c src/core/surface/channel.c src/core/surface/server.c src/python/src/grpc/_adapter/_low_test.py tools/doxygen/Doxyfile.core.internal | ||
| * | | merge with master | Alistair Veitch | 2015-06-01 |
| | | | |||
| | * | 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 | ||
| * | Merge branch 'master' of github.com:grpc/grpc into server_auth_context | Julien Boeuf | 2015-05-29 |
| |\ | |||
| | * | fixing doxygen files after merge. | Julien Boeuf | 2015-05-29 |
| | | | |||
| * | | Merge branch 'master' of github.com:grpc/grpc into server_auth_context | Julien Boeuf | 2015-05-29 |
| |\| | |||
| | * | Tagging 0.9.1 on master. | Nicolas "Pixel" Noble | 2015-05-30 |
| | | | |||
| * | | Merge branch 'master' of github.com:grpc/grpc into server_auth_context | Julien Boeuf | 2015-05-29 |
| |/ | |||
| * | Add doxygen setups for internal documentation | Craig Tiller | 2015-05-29 |
| | | |||
* | | Update doxygen | Craig Tiller | 2015-05-27 |
|/ | |||
* | Get GRPC_FINAL, GRPC_OVERRIDE treated right | Craig Tiller | 2015-05-24 |
| | |||
* | Merge latest | Craig Tiller | 2015-05-24 |
| | |||
* | Add C++ | Craig Tiller | 2015-05-24 |
| | |||
* | Initial Doxyfile generation | Craig Tiller | 2015-05-24 |