Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Add missing headers to build.json | 2015-06-23 | |
| | |||
* | Merge pull request #1969 from ctiller/one-shouldnt-depend-on-protobufs | 2015-06-23 | |
|\ | | | | | Remove Protobuf dependency for C++ | ||
* \ | Merge pull request #2175 from yang-g/constness | 2015-06-23 | |
|\ \ | | | | | | | Add const to ByteBuffer methods and add tests | ||
| * | | Add const to ByteBuffer methods and add tests | 2015-06-22 | |
| | | | |||
* | | | Merge pull request #2154 from jcanizales/fix-build-json | 2015-06-22 | |
|\ \ \ | |/ / |/| | | Add pollset_set.h to build.json | ||
* | | | Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix | 2015-06-22 | |
|\ \ \ | |||
| | * | | Add pollset_set.h to build.json | 2015-06-20 | |
| |/ / | |||
| | * | Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs | 2015-06-19 | |
| | |\ | | |/ | |/| | |||
* | | | Merge branch 'master' of https://github.com/grpc/grpc into ssl_auth_context_fix | 2015-06-19 | |
|\ \ \ | |||
| | * \ | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-18 | |
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | Conflicts: gRPC.podspec tools/doxygen/Doxyfile.core.internal | ||
| * | | | Merge pull request #2104 from murgatroid99/build_json_add_missing_context.h | 2015-06-18 | |
| |\ \ \ | | | | | | | | | | | Added missing but included headers to build.json | ||
* | | | | | Fixing ssl auth context. | 2015-06-18 | |
|/ / / / | |||
| * | | | Added missing but included headers to build.json | 2015-06-17 | |
| | | | | |||
| | * | | Merge branch 'you-complete-me' into we-dont-need-no-backup | 2015-06-17 | |
| | |\ \ | |_|/ / |/| | | | |||
| | | * | Merge branch 'we-dont-need-no-backup' into one-shouldnt-depend-on-protobufs | 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 you-complete-me | 2015-06-16 | |
|\| | | | | |||
| | | | * | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-16 | |
| | | |/| | | |/|/ | | |/| | |/| | | |||
| * | | | make buildtests on windows pass | 2015-06-15 | |
| | | | | |||
| | * | | Merge branch 'you-complete-me' into we-dont-need-no-backup | 2015-06-09 | |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into you-complete-me-csharp | 2015-06-09 | |
|\| | | | |||
| * | | | Remove non-existing file from build.json | 2015-06-09 | |
| | | | | |||
| * | | | Added missing compression.h file. | 2015-06-08 | |
| |\ \ \ | |||
| * | | | | Changes to byte_buffer based on comments. | 2015-06-08 | |
| | | | | | |||
| | * | | | Revert "Revert "Open loop sync/async multithreaded testing"" | 2015-06-08 | |
| |/ / / | |||
| | * | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-08 | |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Revert "Open loop sync/async multithreaded testing" | 2015-06-08 | |
| | | | | |||
| | * | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-08 | |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #1948 from vjpai/poisson | 2015-06-08 | |
| |\ \ \ | | | | | | | | | | | Open loop sync/async multithreaded testing | ||
| | * | | | Add a new test for qps openloop to make sure this code gets exercised | 2015-06-08 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | regularly. Also, convert qps_test to test, from benchmark | ||
| | | | * | Merge branch 'we-dont-need-no-backup' into one-shouldnt-depend-on-protobufs | 2015-06-06 | |
| | | | |\ | | | | |/ | | | |/| | |||
* | | | | | Merge github.com:grpc/grpc into you-complete-me | 2015-06-06 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: test/core/bad_client/bad_client.c | ||
| | | * | | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-06 | |
| | | |\ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | Conflicts: test/core/bad_client/bad_client.c test/core/httpcli/httpcli_test.c | ||
| * | | | | Add working tests for httpcli | 2015-06-05 | |
| | | | | | |||
| | | | * | Add missing file to build.json | 2015-06-05 | |
| | | | | | |||
| | | | * | Progress commit on fixing up C++ | 2015-06-04 | |
| | | |/ | |||
| | * | | Merge branch 'master' into poisson | 2015-06-04 | |
| | |\ \ | | |/ / | |/| | | |||
| | | * | Merge github.com:grpc/grpc into we-dont-need-no-backup | 2015-06-04 | |
| | | |\ | | |_|/ | |/| | | | | | | | | | | Conflicts: tools/doxygen/Doxyfile.core.internal | ||
* | | | | Merge github.com:grpc/grpc into you-complete-me | 2015-06-04 | |
|\| | | | |||
| * | | | Merge pull request #1894 from yang-g/create-thread-pool | 2015-06-03 | |
| |\ \ \ | | | | | | | | | | | Add ability to override default thread pool | ||
| * | | | | Expose gpr_asprintf and gpr_strdup | 2015-06-03 | |
| | | | | | |||
| | * | | | Add ability to override default thread pool | 2015-06-03 | |
| |/ / / | |||
| | * | | Merge branch 'master' into poisson | 2015-06-03 | |
| | |\ \ | | |/ / | |/| | | |||
* | | | | Merge github.com:grpc/grpc into you-complete-me | 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 | 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 | 2015-06-01 | |
| |\ \ \ | |||
| | | * \ | Merge branch 'master' into poisson | 2015-06-01 | |
| | | |\ \ | | | |/ / | | |/| | | |||
* | | | | | Merge github.com:grpc/grpc into you-complete-me | 2015-06-01 | |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | | | * | Merge branch 'but-maybe-i-want-to-poll' into we-dont-need-no-backup | 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 | 2015-05-29 | |
| |\ \ \ \ | |||
| | * \ \ \ | Merge branch 'master' of github.com:grpc/grpc into mdctx_free_creds | 2015-05-29 | |
| | |\ \ \ \ |