Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | fix missed merge issue | Alistair Veitch | 2016-02-03 |
| | |||
* | fix broken merge of build.yaml | Alistair Veitch | 2016-02-03 |
| | |||
* | merge | Alistair Veitch | 2016-02-03 |
|\ | |||
| * | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | Nicolas "Pixel" Noble | 2016-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 | ||
* | \ | merge | Alistair Veitch | 2016-02-02 |
|\ \ \ | |||
| | | * | Merge pull request #5007 from ctiller/memcpy3 | Nicolas Noble | 2016-02-02 |
| | |/| | |/| | | | | | | Use old memcpy for wrappers | ||
| | * | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | Nicolas "Pixel" Noble | 2016-02-02 |
| | |\ \ | | |/ / | |/| | | |||
* | | | | post merge | Alistair Veitch | 2016-02-02 |
| | | | | |||
| | | * | Use old memcpy for wrappers | Craig Tiller | 2016-02-02 |
| | | | | |||
| * | | | Merge branch 'master' into corelimit2 | Vijay Pai | 2016-02-01 |
| |\ \ \ | | | |/ | | |/| | |||
| | * | | Merge pull request #4979 from nicolasnoble/win32_subprocess | Craig Tiller | 2016-02-01 |
| | |\ \ | | | | | | | | | | | Adding windows support for gpr subprocesses. | ||
| | * \ \ | Merge pull request #4978 from nicolasnoble/alarming | Craig Tiller | 2016-01-31 |
| | |\ \ \ | | | | | | | | | | | | | Fixing, using and testing alarm code. | ||
| | | | | * | Merge branch 'census-placeholders' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 |
| | | | | |\ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: package.json tools/doxygen/Doxyfile.core.internal | ||
| | * | | | | Actually moving this to the proper place. | Nicolas "Pixel" Noble | 2016-01-31 |
| | | | | | | |||
| | | | | * | Regenerating files. | Nicolas "Pixel" Noble | 2016-01-31 |
| | | | | | | |||
| | | | | * | Merge branch 'alarming' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 |
| | | | | |\ | | | | |_|/ | | | |/| | | |||
| | | * | | | Adding missing project files. | Nicolas "Pixel" Noble | 2016-01-31 |
| | | | | | | |||
| | | | | * | Merge branch 'win32_subprocess' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-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. | Nicolas "Pixel" Noble | 2016-01-31 |
| | | |/ / | | |/| | | |||
| | | | * | Merge branch 'alarming' into make-ruby-installable | Nicolas "Pixel" Noble | 2016-01-31 |
| | | | |\ | | | | |/ | | | |/| | | | | | | | | | | | Conflicts: tools/run_tests/sources_and_headers.json | ||
| | | * | | Fixing, using and testing alarm code. | Nicolas "Pixel" Noble | 2016-01-31 |
| | |/ / | |||
| | | * | Removing gpr as a separated library. | Nicolas "Pixel" Noble | 2016-01-30 |
| | |/ | |||
| | * | Fixed wrong usage of global var | David Garcia Quintas | 2016-01-28 |
| | | | |||
| | * | DONE!!1one | David Garcia Quintas | 2016-01-27 |
| | | | |||
| | * | After GrpcLibrary refactoring. Compiles and passes. WIP still | David Garcia Quintas | 2016-01-27 |
| | | | |||
| | * | pre sync_stream.cc creation. Does not compile | David Garcia Quintas | 2016-01-25 |
| | | | |||
| | * | async_stream.h done. Compiles | David Garcia Quintas | 2016-01-25 |
| | | | |||
| | * | Further work. Compiles. WIP | David Garcia Quintas | 2016-01-25 |
| | | | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-25 |
| | |\ | |_|/ |/| | | |||
* | | | Fix build | Craig Tiller | 2016-01-22 |
| | | | |||
* | | | Merge pull request #4750 from a-veitch/tag_set | Bogdan Drutu | 2016-01-22 |
|\ \ \ | | | | | | | | | Census Tag Set API and implementation | ||
* \ \ \ | Merge pull request #4812 from ctiller/integrate-zlib | Jan Tattermusch | 2016-01-22 |
|\ \ \ \ | | | | | | | | | | | Make zlib a first class build citizen | ||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-21 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
| | | | * | made codegen targets in build.yaml | David Garcia Quintas | 2016-01-21 |
| | | | | | |||
| | | | * | more dependency/sanity fixes | David Garcia Quintas | 2016-01-21 |
| | | | | | |||
| * | | | | Make zlib a first class build citizen | Craig Tiller | 2016-01-21 |
| | | | | | |||
| | | | * | added missing codegen deps for grp | David Garcia Quintas | 2016-01-21 |
| | | | | | |||
| | | | * | Made "codedgen" directories closed over #includes | David Garcia Quintas | 2016-01-21 |
| | | | | | |||
* | | | | | Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changes | Jan Tattermusch | 2016-01-20 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||
| | | | * | regenerated projects | David Garcia Quintas | 2016-01-20 |
| | | | | | |||
| | | | * | Regenerated projects | David Garcia Quintas | 2016-01-20 |
| | | | | | |||
| | | * | | Rename coresched --> limit_cores | vjpai | 2016-01-19 |
| | | | | | |||
| | | | * | re-generate projects | yang-g | 2016-01-19 |
| | | | | | |||
| | | * | | Merge branch 'master' into corelimit2 | vjpai | 2016-01-19 |
| | | |\ \ | |_|_|/ / |/| | | | | |||
| | * | | | Merge branch 'master' into tag_set | Alistair Veitch | 2016-01-15 |
| | |\ \ \ | |_|/ / / |/| | | | | |||
| | | | * | Merge remote-tracking branch 'upstream/master' into sync_async_mix | yang-g | 2016-01-15 |
| | | | |\ | |_|_|_|/ |/| | | | | |||
* | | | | | Merge pull request #4696 from jtattermusch/win_static_deps | Nicolas Noble | 2016-01-15 |
|\ \ \ \ \ | | | | | | | | | | | | | Link grpc_csharp_ext dependencies on Windows statically | ||
* \ \ \ \ \ | Merge pull request #4688 from jtattermusch/static_deps | Nicolas Noble | 2016-01-15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Statically link dependencies of grpc_csharp_ext | ||
| | | | | | * | move utilities to a separate file | yang-g | 2016-01-15 |
| | | | | | | | |||
| | | | | | * | Merge remote-tracking branch 'upstream/master' into sync_async_mix | yang-g | 2016-01-15 |
| | | | | | |\ | |_|_|_|_|_|/ |/| | | | | | |