aboutsummaryrefslogtreecommitdiffhomepage
path: root/vsprojects
Commit message (Collapse)AuthorAge
* fix missed merge issueGravatar Alistair Veitch2016-02-03
|
* fix broken merge of build.yamlGravatar Alistair Veitch2016-02-03
|
* mergeGravatar Alistair Veitch2016-02-03
|\
| * 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
| | | |
| | | * Use old memcpy for wrappersGravatar Craig Tiller2016-02-02
| | | |
| * | | Merge branch 'master' into corelimit2Gravatar Vijay Pai2016-02-01
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #4979 from nicolasnoble/win32_subprocessGravatar Craig Tiller2016-02-01
| | |\ \ | | | | | | | | | | Adding windows support for gpr subprocesses.
| | * \ \ Merge pull request #4978 from nicolasnoble/alarmingGravatar Craig Tiller2016-01-31
| | |\ \ \ | | | | | | | | | | | | Fixing, using and testing alarm code.
| | | | | * Merge branch 'census-placeholders' into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-01-31
| | | | | |\ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: package.json tools/doxygen/Doxyfile.core.internal
| | * | | | Actually moving this to the proper place.Gravatar Nicolas "Pixel" Noble2016-01-31
| | | | | |
| | | | | * Regenerating files.Gravatar Nicolas "Pixel" Noble2016-01-31
| | | | | |
| | | | | * Merge branch 'alarming' into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-01-31
| | | | | |\ | | | | |_|/ | | | |/| |
| | | * | | Adding missing project files.Gravatar Nicolas "Pixel" Noble2016-01-31
| | | | | |
| | | | | * Merge branch 'win32_subprocess' into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-01-31
| | | | | |\ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: BUILD Makefile binding.gyp build.yaml gRPC.podspec grpc.gemspec src/python/grpcio/grpc_core_dependencies.py tools/run_tests/sources_and_headers.json vsprojects/vcxproj/gpr/gpr.vcxproj vsprojects/vcxproj/gpr/gpr.vcxproj.filters
| | | | * | Adding windows support for gpr subprocesses.Gravatar Nicolas "Pixel" Noble2016-01-31
| | | |/ / | | |/| |
| | | | * Merge branch 'alarming' into make-ruby-installableGravatar Nicolas "Pixel" Noble2016-01-31
| | | | |\ | | | | |/ | | | |/| | | | | | | | | | | Conflicts: tools/run_tests/sources_and_headers.json
| | | * | Fixing, using and testing alarm code.Gravatar Nicolas "Pixel" Noble2016-01-31
| | |/ /
| | | * Removing gpr as a separated library.Gravatar Nicolas "Pixel" Noble2016-01-30
| | |/
| | * Fixed wrong usage of global varGravatar David Garcia Quintas2016-01-28
| | |
| | * DONE!!1oneGravatar David Garcia Quintas2016-01-27
| | |
| | * After GrpcLibrary refactoring. Compiles and passes. WIP stillGravatar David Garcia Quintas2016-01-27
| | |
| | * pre sync_stream.cc creation. Does not compileGravatar David Garcia Quintas2016-01-25
| | |
| | * async_stream.h done. CompilesGravatar David Garcia Quintas2016-01-25
| | |
| | * Further work. Compiles. WIPGravatar David Garcia Quintas2016-01-25
| | |
| | * Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfacesGravatar David Garcia Quintas2016-01-25
| | |\ | |_|/ |/| |
* | | Fix buildGravatar Craig Tiller2016-01-22
| | |
* | | Merge pull request #4750 from a-veitch/tag_setGravatar Bogdan Drutu2016-01-22
|\ \ \ | | | | | | | | Census Tag Set API and implementation
* \ \ \ Merge pull request #4812 from ctiller/integrate-zlibGravatar Jan Tattermusch2016-01-22
|\ \ \ \ | | | | | | | | | | Make zlib a first class build citizen
* \ \ \ \ Merge pull request #4820 from jtattermusch/new_csharp_nugetGravatar Michael Lumish2016-01-22
|\ \ \ \ \ | | | | | | | | | | | | Revamp C# Nuget package
| | | | | * Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfacesGravatar David Garcia Quintas2016-01-21
| | | | | |\ | |_|_|_|_|/ |/| | | | |
| | | | | * made codegen targets in build.yamlGravatar David Garcia Quintas2016-01-21
| | | | | |
| * | | | | revamp native package buildingGravatar Jan Tattermusch2016-01-21
| | | | | |
| | | | | * more dependency/sanity fixesGravatar David Garcia Quintas2016-01-21
| | | | | |
| | * | | | Clean up WindowsGravatar Craig Tiller2016-01-21
| | | | | |
| | * | | | Make zlib a first class build citizenGravatar Craig Tiller2016-01-21
| |/ / / /
| | | | * added missing codegen deps for grpGravatar David Garcia Quintas2016-01-21
| | | | |
| | | | * Made "codedgen" directories closed over #includesGravatar David Garcia Quintas2016-01-21
| | | | |
* | | | | Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changesGravatar Jan Tattermusch2016-01-20
|\ \ \ \ \ | |/ / / / |/| | | |
| | | | * regenerated projectsGravatar David Garcia Quintas2016-01-20
| | | | |
| | | | * Regenerated projectsGravatar David Garcia Quintas2016-01-20
| | | | |
| | | * | Rename coresched --> limit_coresGravatar vjpai2016-01-19
| | | | |
| | | | * re-generate projectsGravatar yang-g2016-01-19
| | | | |
| | | * | Merge branch 'master' into corelimit2Gravatar vjpai2016-01-19
| | | |\ \ | |_|_|/ / |/| | | |
| | * | | Merge branch 'master' into tag_setGravatar Alistair Veitch2016-01-15
| | |\ \ \ | |_|/ / / |/| | | |
| | | | * Merge remote-tracking branch 'upstream/master' into sync_async_mixGravatar yang-g2016-01-15
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #4696 from jtattermusch/win_static_depsGravatar Nicolas Noble2016-01-15
|\ \ \ \ \ | | | | | | | | | | | | Link grpc_csharp_ext dependencies on Windows statically