Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | merge | Alistair Veitch | 2016-02-03 |
|\ | |||
| * | 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 |
| | | | |||
| | * | 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 |
| |/ | |||
| * | Fixed wrong usage of global var | David Garcia Quintas | 2016-01-28 |
| | | |||
| * | DONE!!1one | David Garcia Quintas | 2016-01-27 |
| | | |||
| * | After GrpcLibrary refactoring. Compiles and passes. WIP still | David Garcia Quintas | 2016-01-27 |
| | | |||
| * | pre sync_stream.cc creation. Does not compile | David Garcia Quintas | 2016-01-25 |
| | | |||
| * | async_stream.h done. Compiles | David Garcia Quintas | 2016-01-25 |
| | | |||
| * | Further work. Compiles. WIP | David Garcia Quintas | 2016-01-25 |
| | | |||
| * | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-25 |
| |\ | |/ |/| | |||
* | | Merge pull request #4750 from a-veitch/tag_set | Bogdan Drutu | 2016-01-22 |
|\ \ | | | | | | | Census Tag Set API and implementation | ||
| | * | made codegen targets in build.yaml | David Garcia Quintas | 2016-01-21 |
| | | | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into sync-async-plus-interfaces | David Garcia Quintas | 2016-01-21 |
| | |\ | |_|/ |/| | | |||
* | | | Add -std=gnu99 when building libgrpc | Rob Earhart | 2016-01-21 |
| | | | |||
| | * | more dependency/sanity fixes | 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 |
| | | | |||
| | * | regenerated projects | David Garcia Quintas | 2016-01-20 |
| | | | |||
| | * | Regenerated projects | David Garcia Quintas | 2016-01-20 |
| | | | |||
| * | | Merge branch 'master' into tag_set | Alistair Veitch | 2016-01-15 |
| |\ \ | |/ / |/| | | |||
| | * | Merge remote-tracking branch 'upstream/master' into sync_async_mix | yang-g | 2016-01-15 |
| | |\ | |_|/ |/| | | |||
* | | | Merge pull request #4688 from jtattermusch/static_deps | Nicolas Noble | 2016-01-15 |
|\ \ \ | | | | | | | | | Statically link dependencies of grpc_csharp_ext | ||
| | | * | Merge remote-tracking branch 'upstream/master' into sync_async_mix | yang-g | 2016-01-15 |
| | | |\ | |_|_|/ |/| | | | |||
| | | * | Add new public header | yang-g | 2016-01-14 |
| | | | | |||
| | * | | Move encode/decode API into census.h | Alistair Veitch | 2016-01-13 |
| | | | | |||
| | * | | initial commit | Alistair Veitch | 2016-01-12 |
| | |/ | |||
| * / | regenerate makefile | Jan Tattermusch | 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 |
| | | |||
* | | Start of ping sketch | Craig Tiller | 2015-12-07 |
|/ | |||
* | Merge pull request #4207 from yang-g/server_builder_options | Craig Tiller | 2015-12-03 |
|\ | | | | | Server builder options | ||
* \ | Merge github.com:grpc/grpc into no-transport-metadata | Craig Tiller | 2015-11-25 |
|\ \ | |||
| | * | Add set pointer api to channel_arguments | yang-g | 2015-11-25 |
| | | | |||
| | * | add server_builder_option | yang-g | 2015-11-25 |
| | | | |||
| * | | merge with head | yang-g | 2015-11-24 |
| |\| | |||
| | * | AVL: creation, destroy, add | Craig Tiller | 2015-11-23 |
| | | |