Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | 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 pull request #5007 from ctiller/memcpy3 | 2016-02-02 | |
| |\ | | | | | | | Use old memcpy for wrappers | ||
* | | | Merge branch 'master' of github.com:grpc/grpc into make-ruby-installable | 2016-02-02 | |
|\| | | |||
| | * | Use old memcpy for wrappers | 2016-02-02 | |
| | | | |||
| * | | Merge branch 'master' into corelimit2 | 2016-02-01 | |
| |\| | |||
| | * | Merge pull request #4979 from nicolasnoble/win32_subprocess | 2016-02-01 | |
| | |\ | | | | | | | | | Adding windows support for gpr subprocesses. | ||
| | * \ | Merge pull request #4978 from nicolasnoble/alarming | 2016-01-31 | |
| | |\ \ | | | | | | | | | | | Fixing, using and testing alarm code. | ||
* | | \ \ | Merge branch 'census-placeholders' into make-ruby-installable | 2016-01-31 | |
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | Conflicts: package.json tools/doxygen/Doxyfile.core.internal | ||
| * | | | | Actually moving this to the proper place. | 2016-01-31 | |
| | | | | | |||
* | | | | | Regenerating files. | 2016-01-31 | |
| | | | | | |||
* | | | | | Merge branch 'alarming' into make-ruby-installable | 2016-01-31 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| * | | | | Adding missing project files. | 2016-01-31 | |
| | | | | | |||
* | | | | | Merge branch 'win32_subprocess' into make-ruby-installable | 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. | 2016-01-31 | |
| | |/ / | |/| | | |||
* | | | | Merge branch 'alarming' into make-ruby-installable | 2016-01-31 | |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: tools/run_tests/sources_and_headers.json | ||
| * | | | Fixing, using and testing alarm code. | 2016-01-31 | |
| |/ / | |||
* / / | Removing gpr as a separated library. | 2016-01-30 | |
|/ / | |||
* | | Fixed wrong usage of global var | 2016-01-28 | |
| | | |||
* | | DONE!!1one | 2016-01-27 | |
| | | |||
* | | After GrpcLibrary refactoring. Compiles and passes. WIP still | 2016-01-27 | |
| | | |||
* | | pre sync_stream.cc creation. Does not compile | 2016-01-25 | |
| | | |||
* | | async_stream.h done. Compiles | 2016-01-25 | |
| | | |||
* | | Further work. Compiles. WIP | 2016-01-25 | |
| | | |||
* | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | 2016-01-25 | |
|\ \ | |||
| * | | Fix build | 2016-01-22 | |
| | | | |||
| * | | Merge pull request #4750 from a-veitch/tag_set | 2016-01-22 | |
| |\ \ | | | | | | | | | Census Tag Set API and implementation | ||
| * \ \ | Merge pull request #4812 from ctiller/integrate-zlib | 2016-01-22 | |
| |\ \ \ | | | | | | | | | | | Make zlib a first class build citizen | ||
* | | | | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | 2016-01-21 | |
|\| | | | | |||
* | | | | | made codegen targets in build.yaml | 2016-01-21 | |
| | | | | | |||
* | | | | | more dependency/sanity fixes | 2016-01-21 | |
| | | | | | |||
| | * | | | Make zlib a first class build citizen | 2016-01-21 | |
| | | | | | |||
* | | | | | added missing codegen deps for grp | 2016-01-21 | |
| | | | | | |||
* | | | | | Made "codedgen" directories closed over #includes | 2016-01-21 | |
| | | | | | |||
| * | | | | Merge remote-tracking branch 'upstream/release-0_12' into integrate_0_12_changes | 2016-01-20 | |
| |\ \ \ \ | | |/ / / | |/| | | | |||
* | | | | | regenerated projects | 2016-01-20 | |
| | | | | | |||
* | | | | | Regenerated projects | 2016-01-20 | |
| | | | | | |||
| | | | * | Rename coresched --> limit_cores | 2016-01-19 | |
| | | | | | |||
* | | | | | re-generate projects | 2016-01-19 | |
| | | | | | |||
| | | | * | Merge branch 'master' into corelimit2 | 2016-01-19 | |
| | | | |\ | | |_|_|/ | |/| | | | |||
| | | * | | Merge branch 'master' into tag_set | 2016-01-15 | |
| | | |\ \ | | |_|/ / | |/| | | | |||
* | | | | | Merge remote-tracking branch 'upstream/master' into sync_async_mix | 2016-01-15 | |
|\| | | | | |||
| * | | | | Merge pull request #4696 from jtattermusch/win_static_deps | 2016-01-15 | |
| |\ \ \ \ | | | | | | | | | | | | | Link grpc_csharp_ext dependencies on Windows statically | ||
| * \ \ \ \ | Merge pull request #4688 from jtattermusch/static_deps | 2016-01-15 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Statically link dependencies of grpc_csharp_ext | ||
* | | | | | | | move utilities to a separate file | 2016-01-15 | |
| | | | | | | | |||
* | | | | | | | Merge remote-tracking branch 'upstream/master' into sync_async_mix | 2016-01-15 | |
|\| | | | | | | |||
* | | | | | | | Add new public header | 2016-01-14 | |
| | | | | | | | |||
* | | | | | | | Add a hybrid end2end test mixing sync and async methods | 2016-01-14 | |
| | | | | | | | |||
| | | | * | | | Re-ordering interdependent proto files. | 2016-01-14 | |
| | | | | | | | |||
| * | | | | | | Merge branch 'master' into release-0_12_master_merge | 2016-01-13 | |
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||
| | | | | | * | Make core limitation work for both client and server so that we can run ↵ | 2016-01-13 | |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests on the same machine if desired. The core_list flags to qps_driver are comma-separated lists of core numbers. |