aboutsummaryrefslogtreecommitdiffhomepage
path: root/Makefile
Commit message (Expand)AuthorAge
* Merge pull request #5321 from vjpai/openloopGravatar Vijay Pai2016-02-23
|\
* \ Merge github.com:grpc/grpc into fix-proto-dockerGravatar Craig Tiller2016-02-22
|\ \
| | * Merge branch 'master' into openloopGravatar Vijay Pai2016-02-22
| | |\ | | |/ | |/|
| * | Fixing MacOS.Gravatar Nicolas "Pixel" Noble2016-02-23
| * | rename census log files to avoid build breakage on MacOSGravatar Alistair Veitch2016-02-22
| * | Merge pull request #5302 from nicolasnoble/python-windowsGravatar Masood Malekghassemi2016-02-22
| |\ \
| | | * Tune down multiplier for tsan to 5Gravatar vjpai2016-02-19
| | | * 1. Adjust tsan/asan/msan slowdowns according to documentationGravatar Vijay Pai2016-02-19
| | * | Building the dlls.Gravatar Nicolas "Pixel" Noble2016-02-19
| | * | Adding grpc_dll project.Gravatar Nicolas "Pixel" Noble2016-02-19
| * | | Refactor end2end_test. Make the credentials a separate library.Gravatar yang-g2016-02-18
| | |/ | |/|
* | | Merge github.com:grpc/grpc into fix-proto-dockerGravatar Craig Tiller2016-02-18
|\| |
| * | Merge github.com:grpc/grpc into sceqGravatar Craig Tiller2016-02-17
| |\|
| | * Merge pull request #5209 from vjpai/why_leverGravatar Yang Gao2016-02-16
| | |\
| | * \ Merge pull request #5201 from vjpai/alarm_openloopGravatar David G. Quintas2016-02-16
| | |\ \
| | * \ \ Merge pull request #5098 from a-veitch/base_logGravatar Bogdan Drutu2016-02-16
| | |\ \ \
* | | | | | Revert "Revert "Proto API for LB request/responses""Gravatar Craig Tiller2016-02-11
| |/ / / / |/| | | |
* | | | | Revert "Proto API for LB request/responses"Gravatar Craig Tiller2016-02-11
* | | | | Merge pull request #4038 from dgquintas/grpclb_apiGravatar Craig Tiller2016-02-11
|\ \ \ \ \
| | | | | * fixed_size_thread_pool : why do we even have that lever? It has beenGravatar vjpai2016-02-11
| |_|_|_|/ |/| | | |
| | | * | merge to HEADGravatar Alistair Veitch2016-02-11
| | | |\ \
| | | | | * Simplify and properly implement openloop testing.Gravatar Vijay Pai2016-02-11
| |_|_|_|/ |/| | | |
| * | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_apiGravatar David Garcia Quintas2016-02-11
| |\ \ \ \ | | | |_|/ | | |/| |
* | | | | Revive gprGravatar Vijay Pai2016-02-11
* | | | | Merge branch 'master' into alarm_modsGravatar Vijay Pai2016-02-11
|\ \ \ \ \ | | |/ / / | |/| | |
* | | | | Properly specify dependences on alarm.h in build.yamlGravatar vjpai2016-02-10
* | | | | Make C++ alarm class usable and testable - there were some build issues andGravatar vjpai2016-02-10
| | | * | Merge github.com:grpc/grpc into sceqGravatar Craig Tiller2016-02-09
| | | |\ \ | |_|_|/ / |/| | | |
| * | | | Further cleanupGravatar Craig Tiller2016-02-09
| * | | | Further cleanupGravatar Craig Tiller2016-02-09
| * | | | Further cleanupGravatar Craig Tiller2016-02-09
| * | | | Get compilation working againGravatar Craig Tiller2016-02-09
| * | | | Rollback gpr deletionGravatar Craig Tiller2016-02-09
|/ / / /
| * | | Merge branch 'master' of github.com:grpc/grpc into grpclb_apiGravatar David Garcia Quintas2016-02-08
| |\ \ \ | |/ / / |/| | |
* | | | Flagging master as 0.14.0-dev.Gravatar Nicolas "Pixel" Noble2016-02-09
* | | | Flagging 0.13 as pre1.Gravatar Nicolas "Pixel" Noble2016-02-09
* | | | build.yaml centric versioningGravatar Craig Tiller2016-02-08
| | | * unbreak mergeGravatar Alistair Veitch2016-02-05
| | | * mergeGravatar Alistair Veitch2016-02-05
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #5013 from a-veitch/tag_set_to_contextGravatar Bogdan Drutu2016-02-04
|\ \ \ \
* | | | | Remove pr in MakefileGravatar yang-g2016-02-04
* | | | | Merge pull request #5031 from nicolasnoble/groarGravatar Michael Lumish2016-02-03
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #5036 from ctiller/fixes2Gravatar Jan Tattermusch2016-02-03
|\ \ \ \ \ \
| | | * | | | fix broken merge of build.yamlGravatar Alistair Veitch2016-02-03
| | | * | | | mergeGravatar Alistair Veitch2016-02-03
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Better dynamic linkingGravatar Craig Tiller2016-02-03
| | * | | | | Shifting the merge mechanism.Gravatar Nicolas "Pixel" Noble2016-02-03
| | * | | | | Using libtool instead of ar under MacOS.Gravatar Nicolas "Pixel" Noble2016-02-03
| |/ / / / / |/| | | | |
| | | | | * initial commitGravatar Alistair Veitch2016-02-02
* | | | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-02-03
|\| | | | |