aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge github.com:grpc/grpc into merge-parseGravatar Craig Tiller2016-08-18
|\
| * Merge pull request #7741 from nicolasnoble/manual-upmergeGravatar Nicolas Noble2016-08-18
| |\
| * \ Merge pull request #7735 from y-zeng/cli_main_forkGravatar kpayson642016-08-17
| |\ \
| * \ \ Merge pull request #7594 from chedeti/grpc-thrift-v2Gravatar kpayson642016-08-17
| |\ \ \
| | | | * Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmergeGravatar Nicolas "Pixel" Noble2016-08-16
| | |_|/| | |/| | |
| | | * | Add CliCredentials, config_grpc_cli.hGravatar Yuchen Zeng2016-08-15
| | | * | Merge remote-tracking branch 'upstream/master' into cli_main_forkGravatar Yuchen Zeng2016-08-15
| | | |\ \ | | |_|/ / | |/| | |
| | | | * Remove use of verify-install target in MakefileGravatar murgatroid992016-08-10
| | | | * Remove warning about protobuf 3.0.0+ from the MakefileGravatar murgatroid992016-08-10
* | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-08-09
|\| | | |
| * | | | Merge pull request #6915 from markdroth/filter_apiGravatar kpayson642016-08-05
| |\ \ \ \
* | | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-08-04
|\| | | | |
* | | | | | generate projectsGravatar Craig Tiller2016-08-04
* | | | | | Merge github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-08-04
|\ \ \ \ \ \
| | * \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | | | | | | * | | refine code and add READMEGravatar chedeti2016-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
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | | | | | | * | | thrift serializerGravatar chedeti2016-07-31
| | | | |_|_|_|_|/ / / | | | |/| | | | | | |
| | | | | | | | | | * Bumping to 1.0.0-pre2.Gravatar Nicolas "Pixel" Noble2016-07-29
| | | | | | | * | | | 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
| | | |\ \ \ \ \ \ \ \
| | | | | | | | | | * | Remove references to string_ref_helperGravatar Yuchen Zeng2016-07-25
| | | | | | | | | | * | Merge remote-tracking branch 'upstream/master' into cli_mainGravatar Yuchen Zeng2016-07-25
| | | | | | | | | | |\ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | | | | | | * | | | Merge branch 'master' of https://github.com/grpc/grpc into interop_server_splitGravatar Nicolas "Pixel" Noble2016-07-25
| | | | | | | | |\ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | | | | | | | | * | Remove unnecessary dependenciesGravatar Yuchen Zeng2016-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
| | | | | | | | | |\ \ \ \ | | | | |_|_|_|_|_|/ / / / | | | |/| | | | | | | | |
| | | | | | | | | | | * | Command processing, validationGravatar Yuchen Zeng2016-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 github.com:grpc/grpc into grand-unified-closuresGravatar Craig Tiller2016-07-24
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | | | | | | * | | | | 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 pull request #6737 from ctiller/delayed-writeGravatar Craig Tiller2016-07-19
| | | | | | | | | * | | | Merge branch 'master' into move_timeout_encodingGravatar Robbie Shade2016-07-19
| | | | | | | | | |\ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |