Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #2863 from jtattermusch/csharp_upgrade_to_proto3 | Michael Lumish | 2015-08-27 |
|\ | | | | | Upgrade C# to proto3 | ||
| * | upgrade third_party/protobufs to 3.0.0-beta-1 | Jan Tattermusch | 2015-08-27 |
| | | |||
* | | Merge remote-tracking branch 'upstream/master' into string_ref_auth | yang-g | 2015-08-26 |
|\ \ | |||
| | * | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | Jan Tattermusch | 2015-08-26 |
| | |\ | | |/ | |/| | | | | | | | Conflicts: src/csharp/Grpc.IntegrationTesting/InteropClient.cs | ||
| * | | Merge pull request #3065 from yang-g/string_ref | Craig Tiller | 2015-08-26 |
| |\ \ | | | | | | | | | Use string_ref for incoming metadata | ||
* | | | | auth context api change for string_ref | yang-g | 2015-08-25 |
| |/ / |/| | | |||
| * | | More merge conflict fix | Hongyu Chen | 2015-08-25 |
| | | | |||
| * | | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 |
| |\ \ | |||
| | * \ | Merge pull request #3021 from ctiller/reject-the-stuffs | Yang Gao | 2015-08-25 |
| | |\ \ | | | | | | | | | | | Outlaw illegal metadata characters | ||
| * | | | | Merge remote-tracking branch 'upstream/master' into timespec | Hongyu Chen | 2015-08-25 |
| |\| | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into string_ref | yang-g | 2015-08-25 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | add missing headers from 2495 | yang-g | 2015-08-25 |
| | | | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into string_ref | yang-g | 2015-08-25 |
|\| | | | | |||
* | | | | | impl | yang-g | 2015-08-25 |
| | | | | | |||
| * | | | | Merge pull request #2945 from maxwell-demon/master | Alistair Veitch | 2015-08-25 |
|/| | | | | | | | | | | | | | | Re-install census_filters | ||
* | | | | | 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. | ||
| | | * | | | Move core/profiling/timers_preciseclock.h to core/support/ such that we | Hongyu Chen | 2015-08-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | have a gpr public function which returns cycle clock. | ||
| * | | | | | 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 |
| | |\ \ \ \ \ | |||
| | | * \ \ \ \ | Merge pull request #3019 from dgquintas/channel_args_compression | Yang Gao | 2015-08-24 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Added C API functions for compression args handling (w/ tests) | ||
| | | * | | | | | | Remove accidental dependency on zookeeper in shutdown_test | Craig Tiller | 2015-08-24 |
| | | | |_|/ / / | | | |/| | | | | |||
| | * / | | | | | Eliminate public thread-pool interface | Vijay Pai | 2015-08-24 |
| | |/ / / / / | |||
| | | | | * | | Update projects | Craig Tiller | 2015-08-24 |
| | | | | | | | |||
| * | | | | | | split stream.h into sync_stream.h and async_stream.h | yang-g | 2015-08-21 |
| | | | | | | | |||
| * | | | | | | headers reorg | yang-g | 2015-08-21 |
| | | | | | | | |||
| | | | * | | | rename census_filter.{c,h} to grpc_filter.{c,h} | Hongyu Chen | 2015-08-21 |
| | | | | | | | |||
| | | | | * | | Outlaw illegal metadata characters | Craig Tiller | 2015-08-21 |
| | | |_|/ / | | |/| | | | |||
| | | * | | | Added C API functions for compression args handling (w/ tests) | David Garcia Quintas | 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 |
| | | | | | |||
| | | * | | Merge remote-tracking branch 'upstream/master' | Hongyu Chen | 2015-08-20 |
| | | |\ \ | | | |/ / | | |/| | | |||
| | * | | | Merge pull request #2977 from ctiller/shutdown-c++ | Yang Gao | 2015-08-19 |
| | |\ \ \ | | | | | | | | | | | | | Add a deadline to Server::Shutdown | ||
| | | | * | | Move census_filters from .../channel to .../census | Hongyu Chen | 2015-08-19 |
| | | | | | | |||
| * | | | | | Remove ChannelInterface and replace it with Channel | yang-g | 2015-08-19 |
| |/ / / / | |||
| * | | | | disable grpc_zookeeper target on windows | Jan Tattermusch | 2015-08-18 |
| | | | | | |||
| | * | | | Add a timeout to shutdown to forcefully end calls | Craig Tiller | 2015-08-18 |
| |/ / / | |||
| * | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-17 |
| |\ \ \ | |/ / / |/| | | | |||
* | | | | Merge pull request #2549 from hongweiwang/zookeeper | David G. Quintas | 2015-08-14 |
|\ \ \ \ | | | | | | | | | | | Zookeeper name resolver | ||
| | | | * | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | Jan Tattermusch | 2015-08-14 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
* | | | | | Merge pull request #2376 from rjshade/add_udp_server_2 | Yang Gao | 2015-08-13 |
|\ \ \ \ \ | | | | | | | | | | | | | Add UDP server to gRPC. | ||
* | | | | | | Recreating grpc_test_util_unsecure's template. | Nicolas "Pixel" Noble | 2015-08-14 |
| | | | | | | |||
| * | | | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | Conflicts: Makefile | ||
| | | * | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
* | | | | | | Removing gpr_cancelable. | Nicolas "Pixel" Noble | 2015-08-13 |
| | | | | | | |||
| | | * | | | Updated outdated Grpc.mak | David Garcia Quintas | 2015-08-13 |
| | | | | | | |||
| | | * | | | Merge branch 'master' of github.com:grpc/grpc into compression-interop | David Garcia Quintas | 2015-08-13 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | |||
| * | | | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2 | Robbie Shade | 2015-08-13 |
| |\ \ \ \ \ | |/ / / / / |/| | | | | |