Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Make out private bits private | 2016-02-25 | |
| | |||
* | Remove pollset_set_posix.c | 2016-02-25 | |
| | |||
* | Merge github.com:grpc/grpc into cleaner-posix2 | 2016-02-25 | |
|\ | |||
* \ | Merge branch 'hide-the-pollset-set' into cleaner-posix2 | 2016-02-25 | |
|\ \ | |||
| | * | Merge github.com:grpc/grpc into naming-crisis | 2016-02-23 | |
| | |\ | | |/ | |/| | |||
| * | | Merge github.com:grpc/grpc into fix-proto-docker | 2016-02-22 | |
| |\ \ | |||
| | | * | Merge github.com:grpc/grpc into naming-crisis | 2016-02-22 | |
| | | |\ | | | |/ | | |/| | |||
| | | * | Regenerate files, fix bugs | 2016-02-22 | |
| | | |\ | |||
| | * | \ | Merge pull request #5257 from ctiller/cleaner-posix | 2016-02-22 | |
| | |\ \ \ | | | |_|/ | | |/| | | Separate timer checking from pollsets | ||
| | * | | | rename census log files to avoid build breakage on MacOS | 2016-02-22 | |
| | | |/ | | |/| | |||
* | | | | Start migrating code into ev_XXX | 2016-02-22 | |
| | | | | |||
| | * | | Merge pull request #5302 from nicolasnoble/python-windows | 2016-02-22 | |
| | |\ \ | | | | | | | | | | | Enabling python artifact building for Windows. | ||
| | | * | | Building the dlls. | 2016-02-19 | |
| | | | | | |||
* | | | | | Merge branch 'cleaner-posix' into cleaner-posix2 | 2016-02-18 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||
| * | | | | Merge github.com:grpc/grpc into cleaner-posix | 2016-02-18 | |
| |\ \ \ \ | | | |/ / | | |/| | | |||
| | | * | | Merge github.com:grpc/grpc into fix-proto-docker | 2016-02-18 | |
| | | |\ \ | | | |/ / | | |/| | | |||
| | * | | | Merge github.com:grpc/grpc into sceq | 2016-02-17 | |
| | |\ \ \ | | | | |/ | | | |/| | |||
* | | / | | Moving fd code into ev code | 2016-02-16 | |
|/ / / / | |||
* | | | | Separate timer checking from pollsets | 2016-02-16 | |
| | | | | |||
| | | * | Revert "Revert "Proto API for LB request/responses"" | 2016-02-11 | |
| |_|/ |/| | | |||
* | | | Revert "Proto API for LB request/responses" | 2016-02-11 | |
| | | | |||
| | * | merge to HEAD | 2016-02-11 | |
| | |\ | |||
* | | \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-02-11 | |
|\ \ \ \ | | |_|/ | |/| | | |||
| | * | | Merge github.com:grpc/grpc into sceq | 2016-02-09 | |
| | |\ \ | |||
| * | | | | Get compilation working again | 2016-02-09 | |
| | | | | | |||
| * | | | | Rollback gpr deletion | 2016-02-09 | |
| | |/ / | |/| | | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-02-08 | |
|\| | | | |||
| | | * | merge | 2016-02-05 | |
| | | |\ | | |_|/ | |/| | | |||
| * | | | merge | 2016-02-03 | |
| |\ \ \ | |||
| | | | * | initial commit | 2016-02-02 | |
| | | | | | |||
| | * | | | 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 | ||
| * | | | | | post merge | 2016-02-02 | |
| | | | | | | |||
| | | | * | | Merge github.com:grpc/grpc into sceq | 2016-02-02 | |
| | | | |\| | |||
| | | * | | | Use old memcpy for wrappers | 2016-02-02 | |
| | | | |/ | | | |/| | |||
| | | * | | 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 | |
| | | | | | | | |||
| | * | | | | | 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 | |
| | |/ / | |||
* | | | | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-01-29 | |
|\ \ \ \ | | |/ / | |/| | | |||
| * | | | Merge pull request #4959 from grpc/release-0_12 | 2016-01-29 | |
| |\ \ \ | | | | | | | | | | | Release 0.12 -> master | ||
* | \ \ \ | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | 2016-01-28 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||
| | * | | | async_stream.h done. Compiles | 2016-01-25 | |
| | | | | | |||
| | * | | | Further work. Compiles. WIP | 2016-01-25 | |
| | | | | | |||
| | | * | | Upgrade BoringSSL podspec to v2.0 | 2016-01-25 | |
| | | | | | |||
| | * | | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | 2016-01-25 | |
| | |\ \ \ | | |/ / / | |/| | | |