Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | 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 github.com:grpc/grpc into oops-i-split-it-again | Craig Tiller | 2015-06-18 | |
| | | | |\ | | | |_|/ | | |/| | | ||||
| | * | | | 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 | |||
| | | * | New chttp2 list implementation | Craig Tiller | 2015-06-15 | |
| | | | | ||||
| | | * | Progress on splitting things up | Craig Tiller | 2015-06-15 | |
| | | | | ||||
| | | * | Progress on splitting things up | Craig Tiller | 2015-06-12 | |
| | | | | ||||
| | | * | Make some buckets to pour code into | Craig Tiller | 2015-06-12 | |
| | | | | ||||
| | | * | Add file to build.json | Craig Tiller | 2015-06-12 | |
| | |/ | |/| | ||||
| * | | Merge branch 'you-complete-me' into we-dont-need-no-backup | Craig Tiller | 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 | |
| | | | ||||
| | * | Add missing file to build.json | Craig Tiller | 2015-06-05 | |
| | | | ||||
| * | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 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 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 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 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 | |
| |\ \ | ||||
| | * | | Removing mdctx from the credentials. | Julien Boeuf | 2015-05-29 | |
| | | | | ||||
| | | * | Refactor pollset_kick | Craig Tiller | 2015-05-28 | |
| | | | | | | | | | | | | | | | | | | | | Allow multiple threads to be polling Remove unnecessary windows stubs | |||
* | | | | Initial refactoring and context API changes | Alistair Veitch | 2015-05-26 | |
| |/ / |/| | | ||||
| * | | Starting on low level changes to support server side authentication. | Julien Boeuf | 2015-05-20 | |
|/ / | ||||
| * | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-05-19 | |
| |\ | |/ |/| | ||||
* | | Actually removing grpc_http.h from build.json. | Nicolas "Pixel" Noble | 2015-05-18 | |
| | | ||||
| * | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-05-17 | |
| |\ | |/ |/| | ||||
* | | Merge pull request #1617 from ctiller/force-a-crash-but-then-dont-crash | Nicolas Noble | 2015-05-15 | |
|\ \ | | | | | | | Add subprocess GPR API | |||
| * | | Add header to build.json | Craig Tiller | 2015-05-15 | |
| | | | ||||
* | | | GPR_ASSERT is not an expression | Craig Tiller | 2015-05-15 | |
| | | | ||||
| * | | Add subprocess GPR API | Craig Tiller | 2015-05-15 | |
|/ / | | | | | | | | | | | | | | | Port fling_test to it. This will be used to: - port remaining tests to Windows - enable testing what happens when servers or clients mysteriously disappear | |||
| * | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-05-11 | |
| |\ | |/ |/| | ||||
* | | Addressing comments. | Julien Boeuf | 2015-05-08 | |
| | | ||||
* | | Merging with master. | Julien Boeuf | 2015-05-08 | |
|\ \ | ||||
| * | | added csharp generator plugin | Jan Tattermusch | 2015-05-07 | |
| | | | ||||
* | | | Adding support for per call credentials in core. | Julien Boeuf | 2015-05-07 | |
|/ / | ||||
| * | Initial pollset_set design sketch | Craig Tiller | 2015-05-07 | |
|/ | ||||
* | Merge remote-tracking branch 'upstream/master' into stap | David Garcia Quintas | 2015-04-29 | |
|\ | ||||
* | | Integration of Systemtap (STAP) for profiling. | David Garcia Quintas | 2015-04-29 | |
| | | | | | | | | This commit includes a faulty Makefile to be fixed in a follow commit. | |||
| * | Merge github.com:grpc/grpc into one-pass | Craig Tiller | 2015-04-25 | |
| |\ | |/ |/| | | | | | Conflicts: Makefile | |||
* | | Merge branch 'master' of github.com:grpc/grpc into the-purge-2 | Nicolas "Pixel" Noble | 2015-04-24 | |
|\ \ | | | | | | | | | | | | | Conflicts: include/grpc++/completion_queue.h | |||
| * | | Add the new header to build.json and regenerate projects | Yang Gao | 2015-04-24 | |
| | | | ||||
* | | | Merge branch 'master' of github.com:grpc/grpc into the-purge-2 | Nicolas "Pixel" Noble | 2015-04-24 | |
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/cpp/client/channel.cc vsprojects/vs2010/grpc++.vcxproj vsprojects/vs2013/grpc++.vcxproj.filters | |||
| | * | Merge branch 'batch-metadata' of github.com:ctiller/grpc into one-pass | Craig Tiller | 2015-04-22 | |
| | |\ | | |/ | |/| | | | | | | | | | | Conflicts: src/core/channel/http_client_filter.c src/core/channel/http_server_filter.c | |||
| | * | stuff | Craig Tiller | 2015-04-21 | |
| | | | ||||
| * | | Merge github.com:google/grpc into batch-metadata | Craig Tiller | 2015-04-21 | |
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile vsprojects/Grpc.mak vsprojects/vs2010/Grpc.mak vsprojects/vs2010/grpc.vcxproj vsprojects/vs2010/grpc.vcxproj.filters vsprojects/vs2010/grpc_test_util.vcxproj vsprojects/vs2010/grpc_unsecure.vcxproj vsprojects/vs2010/grpc_unsecure.vcxproj.filters | |||
| | * | Adding a helpful warning message on top of the Makefile and BUILD file. | Nicolas "Pixel" Noble | 2015-04-21 | |
| | | |