Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #2149 from ctiller/oops-i-split-it-again | 2015-06-26 | |
|\ | | | | | Initial transport lock split up | ||
| * | Merge github.com:grpc/grpc into oops-i-split-it-again | 2015-06-25 | |
| |\ | |||
* | \ | Merge github.com:grpc/grpc into are-includes-sane | 2015-06-25 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: tools/doxygen/Doxyfile.c++.internal | ||
* | | | Add a test that headers are properly in build.json | 2015-06-25 | |
| | | | | | | | | | | | | Clean up anything that failed | ||
| | * | Merge github.com:grpc/grpc into oops-i-split-it-again | 2015-06-24 | |
| | |\ | |_|/ |/| | | |||
| * | | Move some code out of src/ into tools/ | 2015-06-23 | |
|/ / | | | | | | | It shouldn't count towards coverage | ||
* | | 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 github.com:grpc/grpc into oops-i-split-it-again | 2015-06-23 | |
| | |\ | |_|/ |/| | | |||
* | | | 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 github.com:grpc/grpc into oops-i-split-it-again | 2015-06-18 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
| * | | | | 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 'we-dont-need-no-backup' into oops-i-split-it-again | 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 | |
| | | |/| | | | |/|/ / | | |/| | | |/| | | | |||
| | | | * | New chttp2 list implementation | 2015-06-15 | |
| | | | | | |||
| * | | | | make buildtests on windows pass | 2015-06-15 | |
| | | | | | |||
| | | | * | Progress on splitting things up | 2015-06-15 | |
| | | | | | |||
| | | | * | Make some buckets to pour code into | 2015-06-12 | |
| | | | | | |||
| | | | * | Add file to build.json | 2015-06-12 | |
| | | |/ | | |/| | |||
| | * | | 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 |