aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge branch 'slice_with_exec_ctx' into metadata_filterGravatar Craig Tiller2016-12-12
|\
| * Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-12-12
| |\
| | * Merge pull request #9062 from grpc/revert-9019-short_deadlinesGravatar Craig Tiller2016-12-12
| | |\
| | * | Revert "Revert "Revert "Remove redundant includes from string.h and tmpfile.h"""Gravatar Craig Tiller2016-12-12
| | | * Revert "Handle (and test) short call deadlines"Gravatar Craig Tiller2016-12-12
| | |/
| * | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-12-12
| |\|
| | * Short deadlines: set Status on deadlineGravatar David Garcia Quintas2016-12-09
| | * Merge remote-tracking branch 'upstream/master' into revert-8949-revert-8922-s...Gravatar Mark D. Roth2016-12-09
| | |\
* | | \ Merge branch 'slice_interning' into metadata_filterGravatar Craig Tiller2016-12-09
|\ \ \ \
| * | | | Merge branch 'slice_with_exec_ctx' into slice_interningGravatar Craig Tiller2016-12-09
| |\| | |
| | * | | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-12-09
| | |\ \ \ | | | | |/ | | | |/|
* | | | | Merge branch 'slice_interning' into metadata_filterGravatar Craig Tiller2016-12-06
|\ \ \ \ \
| * \ \ \ \ Merge branch 'slice_with_exec_ctx' into slice_interningGravatar Craig Tiller2016-12-06
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | | * | Renamed google_benchmark submodule to benchmarkGravatar David Garcia Quintas2016-12-06
| | * | | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-12-06
| | |\| |
| | | | * Revert "Revert "Remove redundant includes from string.h and tmpfile.h""Gravatar Mark D. Roth2016-12-05
| | | |/
| | | * Merge pull request #8949 from grpc/revert-8922-slice_cleanupGravatar Mark D. Roth2016-12-05
| | | |\
| | | * | Revert "Renamed google_benchmark submodule to benchmark"Gravatar Mark D. Roth2016-12-05
| | | | * Revert "Remove redundant includes from string.h and tmpfile.h"Gravatar Mark D. Roth2016-12-05
| | | |/
| | | * Merge pull request #8922 from sreecha/slice_cleanupGravatar Mark D. Roth2016-12-05
| | | |\
| | | * \ Merge pull request #8851 from dgquintas/rename_gbenchGravatar Mark D. Roth2016-12-05
| | | |\ \
| | | * | | Use the same server code for both secure and insecure servers.Gravatar Mark D. Roth2016-12-02
| | | | | * Temporarily enable gpr_slice_* functions to not break api compatibilityGravatar Sree Kuchibhotla2016-12-01
* | | | | | Merge branch 'slice_interning' into metadata_filterGravatar Craig Tiller2016-11-30
|\| | | | |
| * | | | | Merge branch 'slice_with_exec_ctx' into slice_interningGravatar Craig Tiller2016-11-30
| |\| | | |
| | * | | | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-11-30
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | | * | Fixed build.yaml and ran generate_projects.sh.Gravatar Mark D. Roth2016-11-29
| | | | * | Merge branch 'security_handshaker1' into security_handshaker2Gravatar Mark D. Roth2016-11-29
| | | | |\ \ | | | | |/ / | | | |/| |
| | | * | | Run tools/buildgen/generate_projects.shGravatar ncteisen2016-11-28
| | | | | * Renamed google_benchmark submodule to benchmarkGravatar David Garcia Quintas2016-11-23
| | | | |/ | | | |/|
* | | | | Merge branch 'slice_with_exec_ctx' into eliminate_mdstrGravatar Craig Tiller2016-11-18
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-11-18
| |\ \ \ \ | | | |/ / | | |/| |
| | | | * Rename security handshaker files.Gravatar Mark D. Roth2016-11-17
| | | | * Use the same connector code for both secure and insecure clients.Gravatar Mark D. Roth2016-11-17
| | * | | Merge pull request #8617 from markdroth/service_config_jsonGravatar Mark D. Roth2016-11-17
| | |\ \ \
* | | \ \ \ Merge branch 'slice_interning' into eliminate_mdstrGravatar Craig Tiller2016-11-16
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'slice_with_exec_ctx' into slice_interningGravatar Craig Tiller2016-11-16
| |\| | | |
| | * | | | Merge github.com:grpc/grpc into slice_with_exec_ctxGravatar Craig Tiller2016-11-16
| | |\| | |
| | | * | | Merge github.com:grpc/grpc into bm_fullstackGravatar Craig Tiller2016-11-16
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | | * Merge remote-tracking branch 'upstream/master' into service_config_jsonGravatar Mark D. Roth2016-11-16
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | Merge pull request #8680 from ctiller/no_more_legacyGravatar Craig Tiller2016-11-15
| | | | |\ \
| | | | * \ \ Merge remote-tracking branch 'upstream/master' into latency_in_final_infoGravatar Mark D. Roth2016-11-14
| | | | |\ \ \
| | | | | * \ \ Merge pull request #8335 from y-zeng/tosGravatar Yuchen Zeng2016-11-11
| | | | | |\ \ \
* | | | | | | | | Progress towards mdstr eliminationGravatar Craig Tiller2016-11-10
|/ / / / / / / /
| | | | | | | * Merge remote-tracking branch 'upstream/master' into service_config_jsonGravatar Mark D. Roth2016-11-10
| | | | | | | |\ | | | | | |_|_|/ | | | | |/| | |
* | | | | | | | Merge branch 'slice_with_exec_ctx' into slice_interningGravatar Craig Tiller2016-11-10
|\| | | | | | |
| * | | | | | | Fix foward declaration duplicationGravatar Craig Tiller2016-11-10
* | | | | | | | First pass of slice interning facilitiesGravatar Craig Tiller2016-11-10
|/ / / / / / /
| | | * | | | regenerate projectsGravatar yang-g2016-11-09
| | | * | | | Merge remote-tracking branch 'upstream/master' into ssl_fuzzerGravatar yang-g2016-11-09
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |