Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #5302 from nicolasnoble/python-windows | 2016-02-22 | |
|\ | | | | | Enabling python artifact building for Windows. | ||
| * | Building the dlls. | 2016-02-19 | |
| | | |||
* | | Merge github.com:grpc/grpc into sceq | 2016-02-17 | |
|\| | |||
| * | merge to HEAD | 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 | 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 pull request #4959 from grpc/release-0_12 | 2016-01-29 | |
| |\ \ | | | | | | | | | Release 0.12 -> master | ||
| * | | | 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 | |
| |\ \ \ | | | |/ | | |/| | |||
* | | | | Merge github.com:grpc/grpc into sceq | 2016-01-22 | |
|\ \ \ \ | | |/ / | |/| | | |||
| | * | | made codegen targets in build.yaml | 2016-01-21 | |
| | | | | |||
| | * | | added missing codegen deps for grp | 2016-01-21 | |
| | | | | |||
| | * | | Made "codedgen" directories closed over #includes | 2016-01-21 | |
| | | | | |||
* | | | | Merge github.com:grpc/grpc into sceq | 2016-01-15 | |
|\ \ \ \ | | |/ / | |/| | | |||
* | | | | Shared subchannel sketch | 2016-01-15 | |
| | | | | |||
| | * | | Merge branch 'master' into tag_set | 2016-01-15 | |
| | |\ \ | | |/ / | |/| | | |||
| | * | | Move encode/decode API into census.h | 2016-01-13 | |
| | | | | |||
| | * | | initial commit | 2016-01-12 | |
| |/ / |/| | | |||
| * | | Merged from master and resolved merge conflicts | 2016-01-08 | |
| |\ \ | |/ / |/| / | |/ | |||
| * | Expose core metadata validation functions in public headers | 2016-01-06 | |
| | | |||
* | | BoringSSL integration: non-vsprojects changes | 2015-12-22 | |
|/ | |||
* | Merge branch 'connected-subchannel' into ↵ | 2015-12-10 | |
|\ | | | | | | | ping-ping-ping-ping-ping-ping-ping-ping-ping | ||
| * | Kill noop_filter.c | 2015-12-09 | |
| | | |||
| * | Nuke unused files | 2015-12-09 | |
| | | |||
* | | Merge branch 'connected-subchannel' into ↵ | 2015-12-08 | |
|\| | | | | | | | ping-ping-ping-ping-ping-ping-ping-ping-ping | ||
* | | Start of ping sketch | 2015-12-07 | |
| | | |||
| * | Merge release-0.12 into master | 2015-12-07 | |
|/| | |||
* | | Merge pull request #4188 from ctiller/no-transport-metadata | 2015-12-02 | |
|\ \ | | | | | | | Remove metadata contexts | ||
| | * | Point gRPC.podspec to pushed BoringSSL version | 2015-12-01 | |
| | | | | | | | | | | | | (1.0) | ||
| | * | Point spec to BoringSSL | 2015-12-01 | |
| | | | |||
* | | | Merge branch 'release-0_12' | 2015-12-01 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: src/core/security/credentials.c test/core/security/credentials_test.c |