Commit Graph

864 Commits

Author SHA1 Message Date
Stanley Cheung 646677216d Fixed missed conflicts - use constants.logVerbosity instead 2017-05-17 23:15:45 -07:00
Stanley Cheung ebeda85eb8 Upmerge from v1.3.x branch to master 2017-05-17 19:34:47 -07:00
Ken Payson 16f76d2092 Bump to version 1.3.3 2017-05-16 08:54:22 -07:00
murgatroid99 7229f88745 Move gRPC constants to js file to include them in generated documentation 2017-05-10 16:24:05 -07:00
Stanley Cheung 448a11d616 Bump to version 1.3.2 2017-05-10 15:23:29 -07:00
Stanley Cheung 0afa9abb79 Bump to 1.3.2-pre1 2017-05-09 19:08:26 -07:00
murgatroid99 f2f125a38a Switch 'apply' for 'call' in pass-through functions 2017-05-09 15:10:51 -07:00
murgatroid99 ffac55dfd6 Refactor client logic into superclass with generic methods, improve documentation 2017-05-08 18:21:39 -07:00
murgatroid99 572cd7e5a4 Update version to 1.3.1 2017-05-04 10:02:44 -07:00
murgatroid99 5a5cfad2ec Fix a bit of documentation that doesn't apply to Protobuf.js 5 2017-05-02 16:35:16 -07:00
murgatroid99 b1c69e4697 Switch Protobuf.js dependency back to version 5 2017-05-02 14:01:35 -07:00
murgatroid99 ea87dfb711 Clang format 2017-04-28 14:47:50 -07:00
murgatroid99 37797bdfa5 Remove another instance of '#ifdef GRPC_UV' from Node extension 2017-04-28 14:47:43 -07:00
David Garcia Quintas 606945af76 1.3.0 -> 1.3.1-pre1 2017-04-27 14:26:52 -07:00
David Garcia Quintas 3ef2355eae s/1.3.0-pre/1.3.0 2017-04-27 13:59:19 -07:00
murgatroid99 cb5c62afab Remove extra header from node_grpc.cc 2017-04-26 17:22:04 -07:00
murgatroid99 31d1826c0e Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv 2017-04-26 15:31:07 -07:00
Alexander Polcyn f5521c33f9 Revert "Merge branch 'master' into v1.3.x"
This reverts commit 79759fea1a, reversing
changes made to dc36f4df6a.
2017-04-26 14:18:39 -07:00
murgatroid99 2f04c73c7d Clang format 2017-04-25 12:51:40 -07:00
murgatroid99 bc528641fe Remove another instance of '#ifdef GRPC_UV' from Node extension 2017-04-25 12:50:14 -07:00
murgatroid99 3049462b75 Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv 2017-04-25 12:15:53 -07:00
murgatroid99 627e2a5abd Remove another from Node extension 2017-04-25 10:35:56 -07:00
murgatroid99 f94f64fc12 Remove non-libuv code from Node extension 2017-04-24 13:35:21 -07:00
Craig Tiller 59db187c85 Merge branch 'tsan-c++' into hybrid 2017-04-20 19:24:57 +00:00
Craig Tiller a4894fcd02 Merge pull request #10182 from ctiller/cpparena
[EXPERIMENTAL] allocate unary response writer against call arena
2017-04-20 10:32:20 -07:00
murgatroid99 ce67bff2df Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.x 2017-04-19 15:54:27 -07:00
Craig Tiller 06a30eef36 Merge github.com:grpc/grpc into cpparena 2017-04-19 14:40:20 -07:00
Craig Tiller 5b1c5f22f4 Extend clang-format to C#, Node, Ruby 2017-04-19 09:52:18 -07:00
Craig Tiller 0dd38b5cb9 Fix broken merge 2017-04-19 09:45:47 -07:00
Craig Tiller 3512ec926b Fix typo 2017-04-18 13:26:32 -07:00
murgatroid99 76c840036f Node benchmarks: allow arbitrary message size, add CPU usage stats 2017-04-18 11:05:00 -07:00
Craig Tiller c3666d7090 Merge github.com:grpc/grpc into hybrid 2017-04-14 13:15:56 -07:00
Craig Tiller 2c6f63731c Merge github.com:grpc/grpc into cpparena 2017-04-14 13:14:10 -07:00
Sree Kuchibhotla 0e5fa9ebcd Merge branch 'master' into cq_create_api_changes 2017-04-13 18:36:23 -07:00
Sree Kuchibhotla 92e0fee78c Merge branch 'master' into cq_create_api_changes 2017-04-13 16:30:49 -07:00
David Garcia Quintas 9e1acc0796 master to 1.4.0-dev 2017-04-13 16:30:15 -07:00
David Garcia Quintas d9986c3cf7 1.3.x branch cut 2017-04-13 16:20:56 -07:00
murgatroid99 a41fd5b086 Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4 2017-04-13 09:56:17 -07:00
Craig Tiller 57e6485e2d Merge github.com:grpc/grpc into hybrid 2017-04-13 06:46:27 -07:00
Sree Kuchibhotla aa5a92800f Merge branch 'master' into cq_create_api_changes 2017-04-13 03:13:17 -07:00
Craig Tiller b3d308b9a1 Merge github.com:grpc/grpc into cpparena 2017-04-12 15:16:35 -07:00
Craig Tiller cd3ae4f33b Remove API 2017-04-12 14:19:23 -07:00
murgatroid99 70a2a4b01a Bump version to 1.2.4 2017-04-12 10:23:35 -07:00
Craig Tiller c20fa90c60 Merge github.com:grpc/grpc into cpparena 2017-04-12 06:44:00 -07:00
Jan Tattermusch 43713e6ae1 Merge remote-tracking branch 'upstream/v1.2.x' into HEAD 2017-04-12 09:20:29 +02:00
murgatroid99 017a335d2b Only delete core-level server if shutdown was successful 2017-04-11 16:15:32 -07:00
murgatroid99 803392e9f1 Node server: add NULL check to tryShutdown 2017-04-11 12:13:08 -07:00
murgatroid99 c22d62f54e Move ForceShutdown completion handling to new OnComplete method 2017-04-11 11:39:32 -07:00
murgatroid99 42cfaa99bd Add native tag completion callbacks, dispose of server after tryShutdown succeeds 2017-04-10 15:43:09 -07:00
murgatroid99 79962f33c7 Refactor tag completion handling into one function 2017-04-10 14:39:02 -07:00