Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Build out backoff as a library | Craig Tiller | 2016-03-11 |
| | |||
* | Merge github.com:grpc/grpc into naming-crisis | Craig Tiller | 2016-02-23 |
|\ | |||
| * | Merge github.com:grpc/grpc into fix-proto-docker | Craig Tiller | 2016-02-22 |
| |\ | |||
* | \ | Merge github.com:grpc/grpc into naming-crisis | Craig Tiller | 2016-02-22 |
|\ \ \ | | |/ | |/| | |||
* | | | Regenerate files, fix bugs | Craig Tiller | 2016-02-22 |
|\ \ \ | |||
| | * | | Merge pull request #5257 from ctiller/cleaner-posix | Vijay Pai | 2016-02-22 |
| |/| | | | | | | | | | | Separate timer checking from pollsets | ||
| * | | | rename census log files to avoid build breakage on MacOS | Alistair Veitch | 2016-02-22 |
|/ / / | |||
* | | | Merge pull request #5302 from nicolasnoble/python-windows | Masood Malekghassemi | 2016-02-22 |
|\ \ \ | | | | | | | | | Enabling python artifact building for Windows. | ||
| * | | | Building the dlls. | Nicolas "Pixel" Noble | 2016-02-19 |
| | | | | |||
| | * | | Merge github.com:grpc/grpc into cleaner-posix | Craig Tiller | 2016-02-18 |
| | |\ \ | |_|/ / |/| | | | |||
| | | * | Merge github.com:grpc/grpc into fix-proto-docker | Craig Tiller | 2016-02-18 |
| | | |\ | |_|_|/ |/| | | | |||
* | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-02-17 |
|\| | | | |||
| | * | | Separate timer checking from pollsets | Craig Tiller | 2016-02-16 |
| | | | | |||
| | | * | Revert "Revert "Proto API for LB request/responses"" | Craig Tiller | 2016-02-11 |
| | |/ | |||
| | * | Revert "Proto API for LB request/responses" | Craig Tiller | 2016-02-11 |
| | | | |||
| * | | merge to HEAD | Alistair Veitch | 2016-02-11 |
| |\ \ | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-02-11 |
| | | |\ | | | |/ | | |/| | |||
* | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-02-09 |
|\ \ \ \ | |||
| | | * | | Get compilation working again | Craig Tiller | 2016-02-09 |
| | | | | | |||
| | | * | | Rollback gpr deletion | Craig Tiller | 2016-02-09 |
| | |/ / | |/| | | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-02-08 |
| | | |\ | | |_|/ | |/| | | |||
| | * | | merge | Alistair Veitch | 2016-02-05 |
| | |\ \ | | |/ / | |/| | | |||
| * | | | merge | Alistair Veitch | 2016-02-03 |
| |\ \ \ | |||
| | | * | | initial commit | Alistair Veitch | 2016-02-02 |
| | | | | | |||
| | * | | | 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 | ||
| * | | | | | post merge | Alistair Veitch | 2016-02-02 |
| | | | | | | |||
* | | | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-02-02 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| | | | * | | Use old memcpy for wrappers | Craig Tiller | 2016-02-02 |
| | |_|/ / | |/| | | | |||
| * | | | | 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 |
| | | | | | | | |||
| | | | | * | | 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 |
| | |/ / | |/| | | |||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-01-29 |
| | | |\ | | |_|/ | |/| | | |||
| * | | | Merge pull request #4959 from grpc/release-0_12 | Michael Lumish | 2016-01-29 |
| |\ \ \ | | | | | | | | | | | Release 0.12 -> master | ||
| | | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-01-28 |
| | | | |\ | | | | |/ | | | |/| | |||
| * | | | | async_stream.h done. Compiles | David Garcia Quintas | 2016-01-25 |
| | | | | | |||
| * | | | | Further work. Compiles. WIP | David Garcia Quintas | 2016-01-25 |
| | | | | | |||
| | * | | | Upgrade BoringSSL podspec to v2.0 | Jorge Canizales | 2016-01-25 |
| | | | | | |||
| * | | | | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-25 |
| |\ \ \ \ | | | |/ / | | |/| | | |||
* | | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-01-22 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| | * | | | made codegen targets in build.yaml | David Garcia Quintas | 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 github.com:grpc/grpc into sceq | Craig Tiller | 2016-01-15 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
* | | | | | Shared subchannel sketch | Craig Tiller | 2016-01-15 |
| | | | | |