aboutsummaryrefslogtreecommitdiffhomepage
path: root/vsprojects
Commit message (Collapse)AuthorAge
* Merge pull request #5293 from dgquintas/alarm_cppGravatar Vijay Pai2016-02-25
|\ | | | | Made Alarm's constructor a template for deadline
* \ Merge github.com:grpc/grpc into naming-crisisGravatar Craig Tiller2016-02-23
|\ \
| * \ Merge pull request #5334 from jtattermusch/protoc_artifacts_windowsGravatar Nicolas Noble2016-02-23
| |\ \ | | | | | | | | Building protoc artifacts on Windows
| | | * Merge branch 'master' of github.com:grpc/grpc into alarm_cppGravatar David Garcia Quintas2016-02-22
| | | |
| * | | Merge github.com:grpc/grpc into fix-proto-dockerGravatar Craig Tiller2016-02-22
| |\ \ \ | | | |/ | | |/|
* | | | Merge github.com:grpc/grpc into naming-crisisGravatar Craig Tiller2016-02-22
|\ \ \ \ | | |/ / | |/| |
* | | | Regenerate files, fix bugsGravatar Craig Tiller2016-02-22
|\ \ \ \
| | * | | Merge pull request #5257 from ctiller/cleaner-posixGravatar Vijay Pai2016-02-22
| |/| | | | | | | | | | | | | Separate timer checking from pollsets
| * | | | 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
|\ \ \ \ | | | | | | | | | | Enabling python artifact building for Windows.
| | | | * generated projectsGravatar Jan Tattermusch2016-02-22
| | | | |
| | * | | Merge github.com:grpc/grpc into cleaner-posixGravatar Craig Tiller2016-02-21
| | |\ \ \ | |_|/ / / |/| | | |
| * | | | 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 cleaner-posixGravatar Craig Tiller2016-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
| |\ \ \ | | | | | | | | | | Delete fixed_size_thread_pool
| * \ \ \ Merge pull request #5098 from a-veitch/base_logGravatar Bogdan Drutu2016-02-16
| |\ \ \ \ | | | | | | | | | | | | Add Census base log
| | | | * | Separate timer checking from pollsetsGravatar Craig Tiller2016-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
| |\ \ \ | | | | | | | | | | Proto API for LB request/responses
| | | | * fixed_size_thread_pool : why do we even have that lever? It has beenGravatar vjpai2016-02-11
| | |_|/ | |/| | | | | | | | | | deprecated and unused for quite some time.
| | | * merge to HEADGravatar Alistair Veitch2016-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
| | | | | | | | | | | | | | | | | | | | it was not actually even included in the library or the test suite.
* | | | | Merge github.com:grpc/grpc into sceqGravatar 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
| | |\ \ | | |/ / | |/| |
| | | * mergeGravatar Alistair Veitch2016-02-08
| | | |
| | | * unbreak mergeGravatar Alistair Veitch2016-02-05
| | | |
| | | * mergeGravatar Alistair Veitch2016-02-05
| | | |\ | | |_|/ | |/| |
| * | | fix missed merge issueGravatar Alistair Veitch2016-02-03
| | | |
| * | | fix broken merge of build.yamlGravatar Alistair Veitch2016-02-03
| | | |
| * | | mergeGravatar Alistair Veitch2016-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
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: BUILD Makefile binding.gyp build.yaml gRPC.podspec grpc.gemspec package.json src/python/grpcio/grpc_core_dependencies.py templates/Makefile.template tools/doxygen/Doxyfile.core.internal tools/run_tests/sources_and_headers.json vsprojects/vcxproj/gpr/gpr.vcxproj vsprojects/vcxproj/gpr/gpr.vcxproj.filters
| * | \ \ \ mergeGravatar Alistair Veitch2016-02-02
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | | | * | Merge pull request #5007 from ctiller/memcpy3Gravatar Nicolas Noble2016-02-02
| | | |/| | | | |/| | | | | | | | | Use old memcpy for wrappers
| | | * | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-02-02
| | | |\ \ \ | | | |/ / / | | |/| | |
| * | | | | post mergeGravatar Alistair Veitch2016-02-02
| | | | | |
* | | | | | Merge github.com:grpc/grpc into sceqGravatar Craig Tiller2016-02-02
|\ \ \ \ \ \