aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge branch 'master' of https://github.com/grpc/grpc into cpp_bazelnessGravatar Nicolas "Pixel" Noble2017-03-22
|\
| * Merge pull request #10238 from ctiller/bm_chttp2_topGravatar Craig Tiller2017-03-22
| |\
| * \ Merge pull request #9655 from markdroth/remove_initial_connect_stringGravatar Mark D. Roth2017-03-22
| |\ \
| * \ \ Merge pull request #9850 from markdroth/retry_throttleGravatar Mark D. Roth2017-03-21
| |\ \ \
| | | * \ Merge remote-tracking branch 'upstream/master' into remove_initial_connect_st...Gravatar Mark D. Roth2017-03-21
| | | |\ \ | | |_|/ / | |/| | |
| | | | * Add benchmark suite for chttp2Gravatar Craig Tiller2017-03-21
| | |_|/ | |/| |
| * | | Merge pull request #10123 from y-zeng/androidGravatar Yuchen Zeng2017-03-17
| |\ \ \
| | | | * Merge remote-tracking branch 'upstream/master' into remove_initial_connect_st...Gravatar Mark D. Roth2017-03-17
| | | | |\ | | |_|_|/ | |/| | |
| | | * | Merge remote-tracking branch 'upstream/master' into retry_throttleGravatar Mark D. Roth2017-03-17
| | | |\ \ | | |_|/ / | |/| | |
| | | * | Switch to using a CAS loop to update the token value.Gravatar Mark D. Roth2017-03-17
| * | | | Merge pull request #10148 from ctiller/ubsanGravatar Craig Tiller2017-03-16
| |\ \ \ \
| * \ \ \ \ Merge pull request #10122 from ctiller/arenaGravatar Craig Tiller2017-03-15
| |\ \ \ \ \
| | | | | * \ Merge remote-tracking branch 'upstream/master' into retry_throttleGravatar Mark D. Roth2017-03-15
| | | | | |\ \ | | |_|_|_|/ / | |/| | | | |
| | | | * | | Resolve dependency issuesGravatar Yuchen Zeng2017-03-14
| | | * | | | UBSAN cleanupGravatar Craig Tiller2017-03-14
| | | | * | | Split ifaddr related functions out into a separate fileGravatar Yuchen Zeng2017-03-13
| | * | | | | Arena allocator for grpcGravatar Craig Tiller2017-03-12
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'poll-wakeup' of github.com:ctiller/grpc into poll-wakeupGravatar Craig Tiller2017-03-10
| |\ \ \ \ \
| * \ \ \ \ \ Merge github.com:grpc/grpc into poll-wakeupGravatar Craig Tiller2017-03-10
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #10078 from dgquintas/master_to_1.3.0Gravatar David G. Quintas2017-03-10
| | |\ \ \ \ \
| | | | * | | | Fix buildGravatar Craig Tiller2017-03-10
| | | | * | | | Merge github.com:grpc/grpc into poll-wakeupGravatar Craig Tiller2017-03-09
| | | | |\ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge pull request #10039 from ctiller/server_channel_argsGravatar Craig Tiller2017-03-09
| | |\ \ \ \ \ \
* | | | | | | | | Fixing merge (?)Gravatar Nicolas "Pixel" Noble2017-03-10
* | | | | | | | | Merge github.com:grpc/grpc into cpp_bazelnessGravatar Craig Tiller2017-03-09
|\ \ \ \ \ \ \ \ \
| | | | | * | | | | Bumped version to 1.3.0-devGravatar David Garcia Quintas2017-03-09
| | |_|_|/ / / / / | |/| | | | | | |
| | | * | | | | | Merge branch 'master' of https://github.com/grpc/grpc into to-grpc-err-is-humanGravatar ncteisen2017-03-09
| | | |\ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | | | | * | | | Merge remote-tracking branch 'origin/fmac' into poll-wakeupGravatar Craig Tiller2017-03-09
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Fix mac buildGravatar Craig Tiller2017-03-09
| | | | | * | | | Merge github.com:grpc/grpc into poll-wakeupGravatar Craig Tiller2017-03-08
| | | |_|/| | | | | | |/| |/ / / / | | |_|/| | | | | |/| | | | | |
| * | | | | | | Merge pull request #9977 from ctiller/fssplitGravatar Craig Tiller2017-03-08
| |\ \ \ \ \ \ \
| | | | | * \ \ \ Merge github.com:grpc/grpc into server_channel_argsGravatar Craig Tiller2017-03-08
| | | | | |\ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | | | | * | | | Add test of server builder, including channel argsGravatar Craig Tiller2017-03-08
| | | | | * | | | Add channel arguments to server builderGravatar Craig Tiller2017-03-08
| | | | | |/ / /
| | * | | | | | Merge branch 'fssplit' of github.com:ctiller/grpc into fssplitGravatar Craig Tiller2017-03-06
| | |\ \ \ \ \ \
| | * | | | | | | Resolve sanity failuresGravatar Craig Tiller2017-03-06
| * | | | | | | | Merge remote-tracking branch 'upstream/v1.1.x' into 1.1.x_to_masterGravatar David Garcia Quintas2017-03-03
| |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ Merge branch 'fssplit' into poll-wakeupGravatar Craig Tiller2017-03-03
| | | | | |\ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | Fix mac buildGravatar Craig Tiller2017-03-03
| | | |/ / / / / /
| | | | * / / / / Pollset benchmarkGravatar Craig Tiller2017-03-03
| | | |/ / / / /
| * | | | | | | Merge pull request #9939 from ctiller/stream_owned_sliceGravatar Craig Tiller2017-03-03
| |\ \ \ \ \ \ \
| | | | * | | | | Get back trickleGravatar Craig Tiller2017-03-03
| | | | * | | | | Further splittingGravatar Craig Tiller2017-03-03
| | | | * | | | | Split bm_fullstack unary ping pong outGravatar Craig Tiller2017-03-03
| | | | * | | | | Move helpers to a common place, use them everywhereGravatar Craig Tiller2017-03-03
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Revert "Enable lto for performance testing"Gravatar Craig Tiller2017-03-01
| * | | | | | | Merge github.com:grpc/grpc into ltoGravatar Craig Tiller2017-03-01
| |\ \ \ \ \ \ \
| | | | * | | | | Boost grpc version to v1.1.4Gravatar Muxi Yan2017-03-01
| | * | | | | | | Merge pull request #9769 from ctiller/always-use-port-serverGravatar Craig Tiller2017-03-01
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Reserve opt for external builds, use lto for profilingGravatar Craig Tiller2017-03-01