aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge pull request #6915 from markdroth/filter_apiGravatar kpayson642016-08-05
|\
* \ Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-08-04
|\ \
| * | regenerated projectsGravatar David Garcia Quintas2016-08-03
| * | Merge pull request #7370 from rjshade/move_timeout_encodingGravatar kpayson642016-08-02
| |\ \
| | | * Merge remote-tracking branch 'upstream/master' into filter_apiGravatar Mark D. Roth2016-08-02
| | | |\ | | |_|/ | |/| |
| * | | Merge pull request #6774 from a-veitch/add_resourceGravatar kpayson642016-08-02
| |\ \ \
| | | | * Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-08-02
| | | | |\ | | |_|_|/ | |/| | |
| * | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failureGravatar Mark D. Roth2016-08-02
| |\ \ \ \
* | \ \ \ \ Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-08-02
|\ \ \ \ \ \
| | | * \ \ \ Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| | | * | | | regenerated projectsGravatar David Garcia Quintas2016-08-01
| * | | | | | Merge branch 'master' of github.com:grpc/grpc into lr_july_16Gravatar David Garcia Quintas2016-08-01
| |\ \ \ \ \ \
| | | | * \ \ \ Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-08-01
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-07-27
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | | | | | * | Merge branch 'master' into move_timeout_encodingGravatar Robbie Shade2016-07-26
| | | | | | |\ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge pull request #7518 from nicolasnoble/plugins-should-compileGravatar Nicolas Noble2016-07-25
| |\ \ \ \ \ \ \
* | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-07-25
|\| | | | | | | |
| * | | | | | | | Merge pull request #7451 from y-zeng/seperate_generated_filesGravatar kpayson642016-07-25
| |\ \ \ \ \ \ \ \
* | | | | | | | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-07-25
|\| | | | | | | | |
| | | * | | | | | | We should always try to compile the protoc plugins when building tests.Gravatar Nicolas "Pixel" Noble2016-07-25
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #7395 from markdroth/handshake_apiGravatar kpayson642016-07-25
| |\ \ \ \ \ \ \ \
| | | | | | | * \ \ merge to upstream/masterGravatar Alistair Veitch2016-07-21
| | | | | | | |\ \ \
| * | | | | | | \ \ \ Merge pull request #7269 from y-zeng/cli_callGravatar kpayson642016-07-21
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| | | | * | | | | | | Rerun generate_projects.shGravatar Yuchen Zeng2016-07-21
| | | | * | | | | | | Merge remote-tracking branch 'upstream/master' into seperate_generated_filesGravatar Yuchen Zeng2016-07-21
| | | | |\ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| | | * | | | | | | | Merge remote-tracking branch 'upstream/master' into handshake_apiGravatar Mark D. Roth2016-07-20
| | | |\ \ \ \ \ \ \ \
| * | | | | | | | | | | Makefile modifications and instructions to enable cross-compilationGravatar Vijay Pai2016-07-19
| | |_|/ / / / / / / / | |/| | | | | | | | |
| | | | | | | | | * | Merge branch 'master' into move_timeout_encodingGravatar Robbie Shade2016-07-19
| | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* / | | | | | | | | | Splitting interop_server.ccGravatar Nicolas "Pixel" Noble2016-07-18
|/ / / / / / / / / /
| | | * / / / / / / Separate generated file and protobuf dependencyGravatar Yuchen Zeng2016-07-18
| |_|/ / / / / / / |/| | | | | | | |
| | | | | | | | * Merge branch 'filter_call_init_failure' into filter_apiGravatar Mark D. Roth2016-07-15
| | | | | | | | |\ | | | | | |_|_|_|/ | | | | |/| | | |
| | | | * | | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failureGravatar Mark D. Roth2016-07-15
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| | | | | * | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_v0Gravatar David Garcia Quintas2016-07-14
| | | | | |\ \ \ \
| | * | | | | | | | Added handshaker.[ch] to build.yaml.Gravatar Mark D. Roth2016-07-14
| | | |_|_|/ / / / | | |/| | | | | |
| | | * | | | | | Simplified LR filterGravatar David Garcia Quintas2016-07-13
| | | | | | | * | Move timeout_encoding from core/ext/transport/chttp2 to core/lib/transportGravatar Robbie Shade2016-07-13
| | | |_|_|_|/ / | | |/| | | | |
| | | | * | | | Merge remote-tracking branch 'upstream/master' into filter_call_init_failureGravatar Mark D. Roth2016-07-12
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | | | | | * Merge remote-tracking branch 'upstream/master' into filter_apiGravatar Mark D. Roth2016-07-12
| | | | | | | |\ | | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | Merge github.com:grpc/grpc into delayed-writeGravatar Craig Tiller2016-07-12
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Master is now 1.1.0-dev.Gravatar Nicolas "Pixel" Noble2016-07-12
| * | | | | | | Flagging master as 1.0.0-pre1.Gravatar Nicolas "Pixel" Noble2016-07-12
| | | * | | | | Merge remote-tracking branch 'origin/fix_tsan' into lr_july_16Gravatar David Garcia Quintas2016-07-11
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge github.com:grpc/grpc into delayed-writeGravatar Craig Tiller2016-07-11
|\ \ \ \ \ \ \ \
| | | | * | | | | Added new features to load reporting.Gravatar David Garcia Quintas2016-07-10
| | |_|/ / / / / | |/| | | | | |
| | * | | | | | Fix mac buildGravatar Yuchen Zeng2016-07-08
| |/ / / / / /
| | * | | | | Support server reflection in CLIGravatar Yuchen Zeng2016-07-07
* | | | | | | Merge github.com:grpc/grpc into delayed-writeGravatar Craig Tiller2016-07-06
|\ \ \ \ \ \ \
| | * | | | | | Added missing dependencies to grpc++_baseGravatar David Garcia Quintas2016-07-06
| |/ / / / / /
| * | | | | | Merge pull request #7210 from ctiller/no-more-zookeeperGravatar Nicolas Noble2016-07-01
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #6893 from y-zeng/handler_http_responseGravatar Nicolas Noble2016-07-01
| |\ \ \ \ \ \