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 | ||
| * | Move some code out of src/ into tools/ | Craig Tiller | 2015-06-23 |
|/ | | | | It shouldn't count towards coverage | ||
* | 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++ | ||
* \ | Merge pull request #2154 from jcanizales/fix-build-json | Craig Tiller | 2015-06-22 |
|\ \ | | | | | | | Add pollset_set.h to build.json | ||
* \ \ | Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix | Julien Boeuf | 2015-06-22 |
|\ \ \ | |||
| | * | | 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 branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix | Julien Boeuf | 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 | ||
* | | | | Fixing ssl auth context. | Julien Boeuf | 2015-06-18 |
| | | | | |||
| * | | | Added missing but included headers to build.json | murgatroid99 | 2015-06-17 |
|/ / / | |||
| * | | Merge branch 'you-complete-me' into we-dont-need-no-backup | Craig Tiller | 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 github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-06-16 |
| | |/| | |/|/ | |/| |/| | | |||
* | | | Merge branch 'master' of github.com:grpc/grpc into flags-abi | David Garcia Quintas | 2015-06-15 |
|\ \ \ | |||
| * | | | regenerate Grpc.mak | Jan Tattermusch | 2015-06-15 |
| | | | | |||
* | | | | Added flags support to grpc_op. | David Garcia Quintas | 2015-06-14 |
|/ / / | | | | | | | | | | | | | Which includes its propagation to grpc_ioreq and validation mechanisms for checking that only known bits are set ot in). Also added an internal flag (GRPC_WRITE_INTERNAL_COMPRESS) mask for its use in signaling compressed messages. | ||
| * | | 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 |
| | | | |||
| | * | Merge branch 'we-dont-need-no-backup' into one-shouldnt-depend-on-protobufs | Craig Tiller | 2015-06-06 |
| | |\ | | |/ | |/| | |||
| * | | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-06-06 |
| |\ \ | |/ / |/| | | | | | | | | | | | Conflicts: test/core/bad_client/bad_client.c test/core/httpcli/httpcli_test.c | ||
* | | | Add a test of bad settings frame (and fix a bug!) | Craig Tiller | 2015-06-05 |
| | | | |||
| | * | Add missing file to build.json | 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 |
|/ / | |||
* | | bump C# package versions | Jan Tattermusch | 2015-06-02 |
| | | |||
| * | 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 github.com:grpc/grpc into but-maybe-i-want-to-poll | Craig Tiller | 2015-05-30 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | * \ | Merge branch 'master' of github.com:grpc/grpc into server_auth_context | Julien Boeuf | 2015-05-29 |
| | |\ \ | |||
| | | * \ | Merge branch 'master' of github.com:grpc/grpc into mdctx_free_creds | Julien Boeuf | 2015-05-29 |
| | | |\ \ | |||
| | * | \ \ | Merge branch 'master' of github.com:grpc/grpc into server_auth_context | Julien Boeuf | 2015-05-29 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||
| | | | | * | Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup | Craig Tiller | 2015-05-29 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | Make it possible to run with poll() instead of epoll() | Craig Tiller | 2015-05-29 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | Mostly to facilitate testing, but maybe in the future we want to work on Linux systems with broken epoll support? | ||
| | | * | | Removing mdctx from the credentials. | Julien Boeuf | 2015-05-29 |
| | | | | | |||
| | | | * | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-05-29 |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | Merge pull request #1784 from jtattermusch/update_nuspec | Michael Lumish | 2015-05-29 |
| |\ \ \ \ | | | | | | | | | | | | | update nuspec files | ||
| | | | | * | Refactor pollset_kick | Craig Tiller | 2015-05-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow multiple threads to be polling Remove unnecessary windows stubs | ||
| | | | | * | Merge github.com:grpc/grpc into we-dont-need-no-cv | Craig Tiller | 2015-05-28 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| * | | | | | Merge pull request #1770 from jtattermusch/plugin_vcxproj | Nicolas Noble | 2015-05-28 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Provide VS projects for building protoc plugins on Windows | ||
| | | * | | | update nuspec files | Jan Tattermusch | 2015-05-28 |
| | | | | | | |||
| | | | | * | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-05-27 |
| | | | | |\ | | |_|_|_|/ | |/| | | | | |||
| | * | | | | update gitignore | Jan Tattermusch | 2015-05-27 |
| | | | | | |