aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge branch 'master' of github.com:grpc/grpc into codegen_cleanseGravatar David Garcia Quintas2016-08-30
|\
| * Merge pull request #7839 from markdroth/rename_client_configGravatar Mark D. Roth2016-08-29
| |\
| | * Rename grpc_client_config to grpc_resolver_result.Gravatar Mark D. Roth2016-08-22
| * | Merge branch 'v1.0.x' of https://github.com/grpc/grpcGravatar Nicolas "Pixel" Noble2016-08-20
| |\ \ | | |/ | |/|
| | * Bumping version to 1.0.1-pre1.Gravatar Nicolas "Pixel" Noble2016-08-18
| | * Merge pull request #7745 from nicolasnoble/no-more-preGravatar Nicolas Noble2016-08-18
| | |\
| | * \ Merge pull request #7752 from nicolasnoble/unsecure-should-be-unsecureGravatar Nicolas Noble2016-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
| |\ \ \ \ \ \
| | | | | | * | grpc++_unsecure shouldn't depend on grpc but on grpc_unsecure.Gravatar Nicolas "Pixel" Noble2016-08-17
| | | | | | | * Removing pre2 flag.Gravatar Nicolas "Pixel" Noble2016-08-16
| | | | | | |/
| | | | | * / Update required protobuf version to v3.0.0Gravatar Yuchen Zeng2016-08-15
| | | | | |/
| | | | * / 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 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
| | |\ \ \ \ \ \
* | | | | | | | | regenerated projects for the umpth time after mergeGravatar David Garcia Quintas2016-08-02
* | | | | | | | | Merge branch 'master' of github.com:grpc/grpc into codegen_cleanseGravatar David Garcia Quintas2016-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
| | |\ \ \ \ \ \ \ \
* | | | | | | | | | | added gpr_types.hGravatar David Garcia Quintas2016-08-01
| * | | | | | | | | | 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
* | | | | | | | | | | removed codegen/slice_buffer.h and scrubbed codegen/slice.hGravatar David Garcia Quintas2016-07-27
* | | | | | | | | | | removed codegen/log.hGravatar David Garcia Quintas2016-07-27
* | | | | | | | | | | removed codegen/time.hGravatar David Garcia Quintas2016-07-27
* | | | | | | | | | | removed codegen/byte_buffer.hGravatar David Garcia Quintas2016-07-27
* | | | | | | | | | | removed codegen/alloc.hGravatar David Garcia Quintas2016-07-27
| |/ / / / / / / / / |/| | | | | | | | |
| | | * | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \