Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #3104 from yang-g/create_channel | Craig Tiller | 2015-08-27 |
|\ | | | | | Create channel API change | ||
* \ | Merge pull request #2947 from jboeuf/grpc_security_abi | Craig Tiller | 2015-08-27 |
|\ \ | | | | | | | First draft at addressing #1799 for grpc_security. | ||
| | * | implementation fix | yang-g | 2015-08-27 |
| | | | |||
| | * | channel creation API change | yang-g | 2015-08-27 |
| | | | |||
* | | | minor fixes | yang-g | 2015-08-26 |
| |/ |/| | |||
* | | Merge remote-tracking branch 'upstream/master' into string_ref_auth | yang-g | 2015-08-26 |
|\ \ | |||
| * | | Add ostream support for string_ref | Craig Tiller | 2015-08-26 |
| | | | |||
| | * | Adding void* at then end of security related method in order to have a ↵ | Julien Boeuf | 2015-08-25 |
| | | | | | | | | | | | | stable ABI. | ||
* | | | auth context api change for string_ref | yang-g | 2015-08-25 |
|/ / | |||
* | | impl | yang-g | 2015-08-25 |
| | | |||
* | | remove constexpr since gcc 4.4 or vs2010 does not support it | yang-g | 2015-08-25 |
|/ | |||
* | Merge branch 'master' of github.com:grpc/grpc into cpp_string_ref | Julien Boeuf | 2015-08-24 |
|\ | |||
* | | Adding grpc::string_ref class. | Julien Boeuf | 2015-08-24 |
| | | | | | | | | | | | | - Strict subset of http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2012/n3442.html - Useful to avoid unnecessary string copies. | ||
| * | Fix merge failures | yang-g | 2015-08-24 |
| | | |||
| * | merge with head | yang-g | 2015-08-24 |
| |\ | |||
| | * | Merge branch 'master' into fray | Vijay Pai | 2015-08-24 |
| | |\ | |||
| | * | | Eliminate public thread-pool interface | Vijay Pai | 2015-08-24 |
| | | | | |||
| | | * | Merge github.com:grpc/grpc into y12kdm3 | Craig Tiller | 2015-08-21 |
| | | |\ | | | |/ | | |/| | |||
| | | * | prettify comment | Craig Tiller | 2015-08-21 |
| | | | | |||
| * | | | headers reorg | yang-g | 2015-08-21 |
| | | | | |||
| * | | | Merge remote-tracking branch 'upstream/master' into docs | yang-g | 2015-08-20 |
| |\| | | |||
| * | | | Make Channel ctor private | yang-g | 2015-08-20 |
| | | | | |||
| * | | | remove internal_stub | yang-g | 2015-08-20 |
| | | | | |||
| * | | | Fix server side and generic stub | yang-g | 2015-08-20 |
| | | | | |||
| | * | | Merge pull request #2977 from ctiller/shutdown-c++ | Yang Gao | 2015-08-19 |
| | |\ \ | | | | | | | | | | | Add a deadline to Server::Shutdown | ||
| * | | | | Remove ChannelInterface and replace it with Channel | yang-g | 2015-08-19 |
| | | | | | |||
| | * | | | Bug fix. Called c_str on a temp string | yang-g | 2015-08-19 |
| |/ / / | |||
| | | * | Fix syncronous unimplemented methods | Craig Tiller | 2015-08-19 |
| | | | | |||
| | * | | Extend comment | Craig Tiller | 2015-08-19 |
| | | | | |||
| | * | | Add comments, fix a subtle bug | Craig Tiller | 2015-08-19 |
| | | | | |||
| | | * | Merge github.com:grpc/grpc into y12kdm3 | Craig Tiller | 2015-08-18 |
| | | |\ | | |_|/ | |/| | | |||
| | * | | Merge github.com:grpc/grpc into shutdown-c++ | Craig Tiller | 2015-08-18 |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Add a timeout to shutdown to forcefully end calls | Craig Tiller | 2015-08-18 |
| | | | | |||
| * | | | clang-format all source | Craig Tiller | 2015-08-18 |
| |/ / | |||
| * | | Merge pull request #2965 from yang-g/lame_client_error_message | Craig Tiller | 2015-08-18 |
|/| | | | | | | | | Let lame_client accept error status | ||
| * | | Let lame_client accept error status | yang-g | 2015-08-17 |
| | | | |||
| | * | Merge github.com:grpc/grpc into y12kdm3 | Craig Tiller | 2015-08-17 |
| | |\ | |_|/ |/| | | |||
| | * | Re-add accidentally deleted code | Craig Tiller | 2015-08-17 |
| | | | |||
* | | | Merge pull request #2907 from yang-g/error_code_conforming | Vijay Pai | 2015-08-17 |
|\ \ \ | |/ / |/| | | return StatusCode::INTERNAL for proto parsing error | ||
| | * | Merge github.com:grpc/grpc into y12kdm3 | Craig Tiller | 2015-08-17 |
| | |\ | |_|/ |/| | | |||
* | | | Make comment look finished | vjpai | 2015-08-14 |
| | | | |||
* | | | Use emplace_back properly and when appropriate, considering limitations | Vijay Pai | 2015-08-14 |
| | | | | | | | | | | | | of gcc4.4 | ||
* | | | Merge pull request #2921 from yang-g/unknown_service | Vijay Pai | 2015-08-13 |
|\ \ \ | | | | | | | | | Use a sync service to handle requests to unknown services | ||
| * | | | remove redundant ctor | yang-g | 2015-08-13 |
| | | | | |||
| * | | | Use a sync service to handle requests to unknown services | yang-g | 2015-08-13 |
| | | | | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdown | Nicolas "Pixel" Noble | 2015-08-13 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/cpp/client/channel.cc src/cpp/client/client_context.cc | ||
| * \ \ \ | Merge pull request #2890 from yang-g/client_context | David G. Quintas | 2015-08-13 |
| |\ \ \ \ | | |_|_|/ | |/| | | | client code clean up | ||
| | | | * | return StatusCode::INTERNAL for proto parsing error | yang-g | 2015-08-12 |
| | |_|/ | |/| | | |||
| | * | | add const | yang-g | 2015-08-12 |
| | | | | |||
* | | | | Merge remote-tracking branch 'google/master' into the-ultimate-showdown | Nicolas "Pixel" Noble | 2015-08-12 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/csharp/ext/grpc_csharp_ext.c |