Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-01-28 | |
| | | |\ | ||||
| * | | | | Update template, add comment and message about Windows build | murgatroid99 | 2016-01-28 | |
| | | | | | ||||
* | | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-01-28 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||
| | * | | | Make Node library build on Windows | Michael Lumish | 2016-01-27 | |
| |/ / / | ||||
| * | | | Merge branch 'master' into node_binary_precompile | murgatroid99 | 2016-01-26 | |
| |\ \ \ | ||||
| | * | | | Make Node library depend on BoringSSL and zlib, and only build them under ↵ | murgatroid99 | 2016-01-25 | |
| | |/ / | | | | | | | | | | | | | Windows | |||
* | | | | Merge github.com:grpc/grpc into sceq | Craig Tiller | 2016-01-22 | |
|\ \ \ \ | | |/ / | |/| | | ||||
| | * | | Update copyright in binding.gyp | murgatroid99 | 2016-01-20 | |
| | | | | ||||
| | * | | Completed integration of node-pre-gyp into Node library | murgatroid99 | 2016-01-20 | |
| | | | | ||||
* | | | | 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 | |
| | |\ \ | | |/ / | |/| | | ||||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-01-15 | |
| | | |\ | | |_|/ | |/| | | ||||
| | * | | Merge branch 'master' into tag_set | Alistair Veitch | 2016-01-12 | |
| | |\ \ | |_|/ / |/| | | | ||||
| | * | | initial commit | Alistair Veitch | 2016-01-12 | |
| | | | | ||||
| | | * | Srcs and hdrs sanity checks skip third_party | David Garcia Quintas | 2016-01-11 | |
| | | | | ||||
| | | * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2016-01-08 | |
| | | |\ | |_|_|/ |/| | | | ||||
| * | | | Merged from master and resolved merge conflicts | murgatroid99 | 2016-01-08 | |
| |\ \ \ | |/ / / |/| | | | ||||
* | | | | Removed redundant std= cflag | murgatroid99 | 2016-01-07 | |
| | | | | ||||
* | | | | Compile Node extension with c99 and c++11 | murgatroid99 | 2016-01-07 | |
| |/ / |/| | | ||||
| * | | Expose core metadata validation functions in public headers | murgatroid99 | 2016-01-06 | |
|/ / | ||||
| * | Merge branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2015-12-16 | |
| |\ | |/ |/| | ||||
* | | 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 branch 'master' of github.com:grpc/grpc into grpclb_api | David Garcia Quintas | 2015-12-03 | |
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # BUILD # Makefile # binding.gyp # build.yaml # gRPC.podspec # tools/doxygen/Doxyfile.core.internal # tools/run_tests/sources_and_headers.json # vsprojects/vcxproj/grpc/grpc.vcxproj # vsprojects/vcxproj/grpc/grpc.vcxproj.filters # vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj # vsprojects/vcxproj/grpc_unsecure/grpc_unsecure.vcxproj.filters | |||
* | | Merge github.com:grpc/grpc into no-transport-metadata | Craig Tiller | 2015-11-25 | |
|\ \ | ||||
| * \ | merge with head | yang-g | 2015-11-24 | |
| |\ \ | ||||
| | * | | AVL: creation, destroy, add | Craig Tiller | 2015-11-23 | |
| | | | | ||||
* | | | | Merge github.com:grpc/grpc into static-metadata | Craig Tiller | 2015-11-19 | |
|\ \ \ \ | | |/ / | |/| | | ||||
* | | | | Static metadata declarations | Craig Tiller | 2015-11-18 | |
| | | | | ||||
| | * | | merge with head | yang-g | 2015-11-18 | |
| | |\ \ | | |/ / | |/| | | ||||
| * | | | Merge pull request #3993 from ctiller/new_op | David G. Quintas | 2015-11-18 | |
| |\ \ \ | |/ / / |/| | | | Core transport & call cleanup | |||
| | | * | Moved nanopb to 3rd party | David Garcia Quintas | 2015-11-12 | |
| | | | | ||||
| | * | | first part, secure channel only | yang-g | 2015-11-05 | |
| | | | | ||||
| * | | | Generate all file lists and build target lists in binding.gyp from build.yaml | murgatroid99 | 2015-11-05 | |
| |/ / | ||||
| | * | Proto API for LB request/responses | David Garcia Quintas | 2015-11-03 | |
| |/ | ||||
* / | stream_op cleanup: build system changes | Craig Tiller | 2015-11-02 | |
|/ | ||||
* | Compile against Node's version of zlib | murgatroid99 | 2015-10-26 | |
| | ||||
* | Removed extraneous C++ settings in Node gyp C targets | murgatroid99 | 2015-10-23 | |
| | ||||
* | Compile statically against Node's OpenSSL headers | murgatroid99 | 2015-10-23 | |
| | ||||
* | Modified Mac build fix for new binding.gyp structure | murgatroid99 | 2015-10-22 | |
| | ||||
* | Copy Node Mac build fix from old pull request (#1199) | murgatroid99 | 2015-10-22 | |
| | ||||
* | Merge pull request #3643 from dgquintas/microchannels | Craig Tiller | 2015-10-22 | |
|\ | | | | | μChannels implementation. | |||
* | | Changed to a more portable Node version check in binding.gyp | murgatroid99 | 2015-10-19 | |
| | | ||||
| * | Merge branch 'master' of github.com:grpc/grpc into microchannels | David Garcia Quintas | 2015-10-19 | |
| |\ | |/ |/| | ||||
* | | Merge pull request #3726 from dgquintas/iomgr_executor | Craig Tiller | 2015-10-19 | |
|\ \ | | | | | | | Introducing grpc_executor, for all your threading needs | |||
* \ \ | Merge pull request #3618 from dgquintas/cq_alarm | Vijay Pai | 2015-10-14 | |
|\ \ \ | | | | | | | | | Added grpc_alarm (renamed previous one to grpc_timer) | |||
| * | | | fixed faulty merge | David Garcia Quintas | 2015-10-14 | |
| | |/ | |/| |