Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' of github.com:grpc/grpc into codegen_lib | David Garcia Quintas | 2016-02-18 |
|\ | |||
* | | Split codegen target and made it libs | David Garcia Quintas | 2016-02-18 |
| | | |||
| * | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-02-17 |
| |\ | |/ |/| | |||
* | | merge to HEAD | Alistair Veitch | 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 | 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 pull request #4959 from grpc/release-0_12 | Michael Lumish | 2016-01-29 |
|\ \ \ | | | | | | | | | Release 0.12 -> master | ||
* | | | | 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 |
| | | | | |||
| * | | | Merge branch 'master' into tag_set | Alistair Veitch | 2016-01-15 |
| |\ \ \ | |/ / / |/| | | | |||
| * | | | Move encode/decode API into census.h | Alistair Veitch | 2016-01-13 |
| | | | | |||
| * | | | initial commit | Alistair Veitch | 2016-01-12 |
| | |/ | |/| | |||
* | | | Merged from master and resolved merge conflicts | murgatroid99 | 2016-01-08 |
|\| | | |/ |/| | |||
* | | Expose core metadata validation functions in public headers | murgatroid99 | 2016-01-06 |
| | | |||
| * | BoringSSL integration: non-vsprojects changes | Craig Tiller | 2015-12-22 |
|/ | |||
* | Merge branch 'connected-subchannel' into ↵ | Craig Tiller | 2015-12-10 |
|\ | | | | | | | ping-ping-ping-ping-ping-ping-ping-ping-ping | ||
| * | Kill noop_filter.c | Craig Tiller | 2015-12-09 |
| | | |||
| * | Nuke unused files | Craig Tiller | 2015-12-09 |
| | | |||
* | | Merge branch 'connected-subchannel' into ↵ | Craig Tiller | 2015-12-08 |
|\| | | | | | | | ping-ping-ping-ping-ping-ping-ping-ping-ping | ||
* | | Start of ping sketch | Craig Tiller | 2015-12-07 |
| | | |||
| * | Merge release-0.12 into master | Jorge Canizales | 2015-12-07 |
|/| | |||
* | | Merge pull request #4188 from ctiller/no-transport-metadata | Sree Kuchibhotla | 2015-12-02 |
|\ \ | | | | | | | Remove metadata contexts | ||
| | * | Point gRPC.podspec to pushed BoringSSL version | Jorge Canizales | 2015-12-01 |
| | | | | | | | | | | | | (1.0) | ||
| | * | Point spec to BoringSSL | Jorge Canizales | 2015-12-01 |
| | | | |||
* | | | Merge branch 'release-0_12' | Nicolas "Pixel" Noble | 2015-12-01 |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: src/core/security/credentials.c test/core/security/credentials_test.c |