Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | merge with upstream and resolve conflicts | yang-g | 2015-07-06 |
|\ | |||
* | | compiles | yang-g | 2015-07-06 |
| | | |||
| * | Add a test that headers are properly in build.json | Craig Tiller | 2015-06-25 |
| | | | | | | | | Clean up anything that failed | ||
| * | release memory even if the status is false | yang-g | 2015-06-23 |
| | | |||
| * | Only copy stuff when status is ok | 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 const to ByteBuffer methods and add tests | Yang Gao | 2015-06-22 |
| | | | |||
| | * | Update to set flags=0 on all ops | Craig Tiller | 2015-06-22 |
| | | | |||
| | * | Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs | Craig Tiller | 2015-06-22 |
| | |\ | | |/ | |/| | |||
| | * | Merge github.com:grpc/grpc into one-shouldnt-depend-on-protobufs | Craig Tiller | 2015-06-19 |
| | |\ | |_|/ |/| | | |||
| * | | Merge remote-tracking branch 'ctiller-repo/we-dont-need-no-backup' into poller2 | Vijay Pai | 2015-06-18 |
| |\ \ | |/ / |/| | | |||
* | | | Merge pull request #2071 from dgquintas/compression-levels | Craig Tiller | 2015-06-17 |
|\ \ \ | | | | | | | | | Introduced compression levels as an abstraction for the actual algorithm | ||
| | * | | Split cq creation from request initiation so that cq creation | Vijay Pai | 2015-06-17 |
| |/ / |/| | | | | | | | | can be removed from C++ lock. | ||
| | * | 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 you-complete-me | Craig Tiller | 2015-06-16 |
|\ \ \ \ | |||
| | | | * | Merge github.com:grpc/grpc into we-dont-need-no-backup | Craig Tiller | 2015-06-16 |
| |_|_|/| |/| | |/ | | |/| | |/| | | |||
| * | | | Merge pull request #2079 from yang-g/statusChange | Nicolas Noble | 2015-06-16 |
| |\ \ \ | | | | | | | | | | | Update the Status API | ||
| | | * | | Exposed compression level in channel arguments (C and C++) | David Garcia Quintas | 2015-06-16 |
| | | | | | |||
| | * | | | Update the Status API | Yang Gao | 2015-06-16 |
| | |/ / | |||
| * / / | Added changes to c++ and ruby wrappers | David Garcia Quintas | 2015-06-15 |
| |/ / | |||
* | | | Merge remote-tracking branch 'upstream/master' into you-complete-me-csharp | Jan Tattermusch | 2015-06-09 |
|\| | | |||
| * | | Added missing compression.h file. | David Garcia Quintas | 2015-06-08 |
| |\ \ | |||
| * | | | Changes to byte_buffer based on comments. | David Garcia Quintas | 2015-06-08 |
| | | | | |||
| | * | | Revert "Revert "Open loop sync/async multithreaded testing"" | Vijay Pai | 2015-06-08 |
| |/ / | |||
| * | | Revert "Open loop sync/async multithreaded testing" | Craig Tiller | 2015-06-08 |
| | | | |||
| | * | Merge branch 'one-shouldnt-depend-on-protobufs' of github.com:ctiller/grpc ↵ | Craig Tiller | 2015-06-05 |
| | |\ | | | | | | | | | | | | | into one-shouldnt-depend-on-protobufs | ||
| | * | | Clarify serialization traits interface | Craig Tiller | 2015-06-05 |
| | | | | |||
| | | * | Fix memory leak | Craig Tiller | 2015-06-05 |
| | | | | |||
| | | * | Fix memory leak | Craig Tiller | 2015-06-05 |
| | |/ | |||
| | * | Remove old code | Craig Tiller | 2015-06-05 |
| | | | |||
| | * | Get server call tags right | Craig Tiller | 2015-06-05 |
| | | | |||
| | * | Remove old code | Craig Tiller | 2015-06-05 |
| | | | |||
| | * | clang-format | Craig Tiller | 2015-06-05 |
| | | | |||
| * | | clang-format | Vijay Pai | 2015-06-05 |
| | | | |||
| | * | Everything compiles again | Craig Tiller | 2015-06-04 |
| | | | |||
| | * | Client side compiles/links | Craig Tiller | 2015-06-04 |
| | | | |||
| | * | Progress commit on fixing up C++ | Craig Tiller | 2015-06-04 |
| | | | |||
| * | | Merge branch 'master' into poisson | vjpai | 2015-06-04 |
| |\ \ | |||
| | | * | Merge branch 'we-dont-need-no-backup' into one-shouldnt-depend-on-protobufs | Craig Tiller | 2015-06-04 |
| | | |\ | |||
| | | * | | Beginning the cleanup | 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 |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Add ability to override default thread pool | Yang Gao | 2015-06-03 |
| | | | | |||
| | * | | Account for time difference in mac and linux | Vijay Pai | 2015-06-03 |
| | | | | |||
| | * | | Merge branch 'master' into poisson | vjpai | 2015-06-03 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #1866 from dgquintas/stack-allocate-bb-reader | Craig Tiller | 2015-06-02 |
| |\ \ \ | | | | | | | | | | | Removed grpc_byte_buffer_reader_{create,destroy}. | ||
* | | | | | 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 | ||
| | | * | | Support use of high_res clock in timepoints | vjpai | 2015-06-02 |
| | | | | | |||
| | * | | | Removed grpc_byte_buffer_reader_{create,destroy}. | David Garcia Quintas | 2015-06-01 |
| | |/ / | | | | | | | | | | | | | | | | | Introduced grpc_byte_buffer_init instead. It's now the user's responsibility to manage memory. |