aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Resolved merge conflicts with masterGravatar murgatroid992015-08-14
|\
| * Merge pull request #2944 from murgatroid99/node_server_listen_remnantsGravatar Stanley Cheung2015-08-14
| |\
| * \ Merge pull request #2934 from tbetbetbe/grpc-ruby-add-more-auth-interop-testsGravatar Michael Lumish2015-08-14
| |\ \
| | * | Merges timeout interop test changeGravatar Tim Emiola2015-08-14
| |/ /
| * | Merge pull request #2937 from tbetbetbe/grpc-ruby-add-timeout-interop-testGravatar Michael Lumish2015-08-14
| |\ \
| | | * Replaced remaining references to 'listen' with 'start'Gravatar murgatroid992015-08-14
| | |/ | |/|
| * | Merge pull request #2941 from nicolasnoble/zookeeper-is-c-not-c++Gravatar Michael Lumish2015-08-14
| |\ \
| | * | Fixing zookeeper's installation.Gravatar Nicolas "Pixel" Noble2015-08-14
| |/ /
| * | Merge pull request #2549 from hongweiwang/zookeeperGravatar David G. Quintas2015-08-14
| |\ \
| * \ \ Merge pull request #2935 from jcanizales/add-grpc-prefixGravatar David G. Quintas2015-08-14
| |\ \ \
| * \ \ \ Merge pull request #2938 from jtattermusch/fix_codegen_outputGravatar David G. Quintas2015-08-14
| |\ \ \ \
| | * | | | dont generate directories in C# protoc pluginGravatar Jan Tattermusch2015-08-14
| * | | | | Merge pull request #2799 from ctiller/selective-townGravatar Jan Tattermusch2015-08-14
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #2696 from murgatroid99/node_client_connectivityGravatar Jan Tattermusch2015-08-14
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | | | | | * Adds the ruby timeout interop test.Gravatar Tim Emiola2015-08-14
| * | | | | | Merge pull request #2376 from rjshade/add_udp_server_2Gravatar Yang Gao2015-08-13
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #2931 from dgquintas/none-to-identityGravatar Yang Gao2015-08-13
| |\ \ \ \ \ \ \
| | | | | | * | | Let people generate ObjC code from an ArduinoGravatar Jorge Canizales2015-08-13
| | | | | | | | * Breaks API - switches timeout to a keyword arg.Gravatar Tim Emiola2015-08-13
| | |_|_|_|_|_|/ | |/| | | | | |
| | | | | | * | Add ::grpc:: prefixGravatar Jorge Canizales2015-08-13
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge pull request #2932 from nicolasnoble/restoring-windows-building-gaahGravatar David G. Quintas2015-08-13
| |\ \ \ \ \ \
| | | | | | | * Minor fix on commentsGravatar Hongwei Wang2015-08-13
| | * | | | | | Recreating grpc_test_util_unsecure's template.Gravatar Nicolas "Pixel" Noble2015-08-14
| |/ / / / / /
| | * / / / / Renamed "none" as "identity" for the no-op compression algorithm for consiste...Gravatar David Garcia Quintas2015-08-13
| |/ / / / /
| | | | | * Address comments and update grpc pluginsGravatar Hongwei Wang2015-08-13
| | * | | | Added copyright notice to udp_server.cGravatar Robbie Shade2015-08-13
| | * | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2Gravatar Robbie Shade2015-08-13
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Update to latest API changes.Gravatar Robbie Shade2015-08-13
| | * | | | Add Apple specific #define for IPV6_RECVPKTINFOGravatar Robbie Shade2015-08-13
| * | | | | Merge pull request #2919 from nicolasnoble/report-cullingGravatar Jan Tattermusch2015-08-13
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #2921 from yang-g/unknown_serviceGravatar Vijay Pai2015-08-13
| |\ \ \ \ \ \
| | | | * | | | Regenerated project filesGravatar Robbie Shade2015-08-13
| * | | | | | | Merge pull request #2612 from nicolasnoble/the-ultimate-showdownGravatar Vijay Pai2015-08-13
| |\ \ \ \ \ \ \
| | | | | * \ \ \ Merge remote-tracking branch 'upstream/master' into add_udp_server_2Gravatar Robbie Shade2015-08-13
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | | | * | | | | Reducing JUnit's report size.Gravatar Nicolas "Pixel" Noble2015-08-13
| | | * | | | | | remove redundant ctorGravatar yang-g2015-08-13
| | * | | | | | | Merge branch 'master' of github.com:grpc/grpc into the-ultimate-showdownGravatar Nicolas "Pixel" Noble2015-08-13
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #2922 from yang-g/proto3_cppGravatar Vijay Pai2015-08-13
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #2926 from nicolasnoble/cancel_gpr_cancelableGravatar Yang Gao2015-08-13
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Removing gpr_cancelable.Gravatar Nicolas "Pixel" Noble2015-08-13
| |/ / / / / / / / /
| | * | | | | | | | update the interop test protos and code to proto3Gravatar yang-g2015-08-13
| | | | | | * | | | Regenerated project filesGravatar Robbie Shade2015-08-13
| | | | | | * | | | Merge remote-tracking branch 'upstream/master' into add_udp_server_2Gravatar Robbie Shade2015-08-13
| | | | | | |\ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #2877 from stanley-cheung/php_connectivity_apiGravatar Michael Lumish2015-08-13
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #2925 from grpc/revert-2910-timeout_on_sleeping_serverGravatar Jan Tattermusch2015-08-13
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Revert "implement timeout_on_sleeping_server interop test"Gravatar Jan Tattermusch2015-08-13
| |/ / / / / / / / / /
| * | | | | | | | | | Merge pull request #2910 from jtattermusch/timeout_on_sleeping_serverGravatar Michael Lumish2015-08-13
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #2924 from mzhaom/zlib-depGravatar Nicolas Noble2015-08-13
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Let grpc target depend on //external:zlib so that "-lz" or a real zlibGravatar Ming Zhao2015-08-13
| | | | | * | | | | | | | use proto3 syntax in c++ test protosGravatar yang-g2015-08-13