925 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Garcia Quintas	ed48fc0ebc	Merge commit '3049460b75ac557348243601896ed68ca8145522' into master-upmerge-v1.3.x	2017-04-28 14:45:55 -07:00
murgatroid99	16dbbf4fab	Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv	2017-04-25 12:15:53 -07:00
murgatroid99	cf65112c24	Remove another from Node extension	2017-04-25 10:35:56 -07:00
jiangtaoli2016	662400d46f	Merge branch 'master' into new_tsi	2017-04-24 15:33:41 -07:00
murgatroid99	c084b4464a	Remove non-libuv code from Node extension	2017-04-24 13:35:21 -07:00
jiangtaoli2016	65856a7cf4	Merge branch 'master' into new_tsi	2017-04-24 09:02:11 -07:00
Craig Tiller	c2717d1270	Merge branch 'tsan-c++' into hybrid	2017-04-20 19:24:57 +00:00
Craig Tiller	fab8ad6200	Merge pull request #10182 from ctiller/cpparena ... [EXPERIMENTAL] allocate unary response writer against call arena	2017-04-20 10:32:20 -07:00
murgatroid99	0b6b8312e9	Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.x	2017-04-19 15:54:27 -07:00
Craig Tiller	db70eca069	Merge github.com:grpc/grpc into cpparena	2017-04-19 14:40:20 -07:00
Craig Tiller	e5a36589a6	Extend clang-format to C#, Node, Ruby	2017-04-19 09:52:18 -07:00
Craig Tiller	8934a59db0	Fix broken merge	2017-04-19 09:45:47 -07:00
Craig Tiller	56dc3c2051	Fix typo	2017-04-18 13:26:32 -07:00
murgatroid99	12fdb4192a	Node benchmarks: allow arbitrary message size, add CPU usage stats	2017-04-18 11:05:00 -07:00
jiangtaoli2016	c52c60f7b7	Merge branch 'master' into new_tsi	2017-04-15 10:20:51 -07:00
Craig Tiller	fdde9b8eea	Merge github.com:grpc/grpc into hybrid	2017-04-14 13:15:56 -07:00
Craig Tiller	991f0b18c2	Merge github.com:grpc/grpc into cpparena	2017-04-14 13:14:10 -07:00
Sree Kuchibhotla	c5cb93c6dd	Merge branch 'master' into cq_create_api_changes	2017-04-13 18:36:23 -07:00
David Garcia Quintas	ba33736e63	Merge remote-tracking branch 'upstream/v1.3.x' into master_merge_1.3	2017-04-13 16:41:35 -07:00
Sree Kuchibhotla	67bdc5a3d0	Merge branch 'master' into cq_create_api_changes	2017-04-13 16:30:49 -07:00
David Garcia Quintas	6c175a3d44	master to 1.4.0-dev	2017-04-13 16:30:15 -07:00
David Garcia Quintas	5706b9c014	1.3.x branch cut	2017-04-13 16:20:56 -07:00
murgatroid99	d8637878c5	Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4	2017-04-13 09:56:17 -07:00
Craig Tiller	0eb68f9d8a	Merge github.com:grpc/grpc into hybrid	2017-04-13 06:46:27 -07:00
Sree Kuchibhotla	1f521d3cef	Merge branch 'master' into cq_create_api_changes	2017-04-13 03:13:17 -07:00
Craig Tiller	857a8fd02b	Merge github.com:grpc/grpc into cpparena	2017-04-12 15:16:35 -07:00
Craig Tiller	d003e30786	Remove API	2017-04-12 14:19:23 -07:00
murgatroid99	ecf89f18d8	Bump version to 1.2.4	2017-04-12 10:23:35 -07:00
Craig Tiller	dad63feb12	Merge github.com:grpc/grpc into cpparena	2017-04-12 06:44:00 -07:00
Jan Tattermusch	48ba0d0c4a	Merge remote-tracking branch 'upstream/v1.2.x' into HEAD	2017-04-12 09:20:29 +02:00
murgatroid99	8b7472fbec	Only delete core-level server if shutdown was successful	2017-04-11 16:15:32 -07:00
murgatroid99	902527e529	Node server: add NULL check to tryShutdown	2017-04-11 12:13:08 -07:00
murgatroid99	8b37153972	Move ForceShutdown completion handling to new OnComplete method	2017-04-11 11:39:32 -07:00
murgatroid99	da129b2b4a	Add native tag completion callbacks, dispose of server after tryShutdown succeeds	2017-04-10 15:43:09 -07:00
murgatroid99	25d8d5b609	Refactor tag completion handling into one function	2017-04-10 14:39:02 -07:00
Sree Kuchibhotla	1e1b832868	Merge branch 'master' into cq_create_api_changes	2017-04-10 13:35:50 -07:00
jiangtaoli2016	46f70cea58	Merge branch 'master' into new_tsi	2017-04-10 13:29:16 -07:00
murgatroid99	a43dd4ca63	Ignore a couple of errors in the Node express benchmark	2017-04-10 12:47:09 -07:00
Sree Kuchibhotla	48c83cea07	Merge branch 'master' into cq_create_api_changes	2017-04-07 13:44:34 -07:00
murgatroid99	e367327fe4	Bump version to 1.2.3	2017-04-07 10:41:21 -07:00
murgatroid99	4a2065de03	Ignore a couple of errors in the Node express benchmark	2017-04-07 10:18:58 -07:00
Jan Tattermusch	b11cb2857e	Merge pull request #10500 from jtattermusch/upmerge_v12x ... Upmerge from upstream/v1.2.x to master	2017-04-07 07:46:45 +02:00
Michael Lumish	836687cd26	Merge pull request #10468 from murgatroid99/node_call_destruction_bug ... Fix call destruction bug	2017-04-06 17:29:15 -07:00
Michael Lumish	f220d8905f	Merge pull request #10503 from murgatroid99/node_memory_leak_2 ... Node slice leaks	2017-04-06 17:23:00 -07:00
murgatroid99	60a0ed4903	Node: consolidate call destruction logic	2017-04-06 13:54:37 -07:00
Sree Kuchibhotla	76130a5088	Merge branch 'master' into cq_create_api_changes	2017-04-06 13:09:17 -07:00
murgatroid99	f443ffd52b	Correct use of ProtoBuf.js 6 message encoding API	2017-04-06 10:53:57 -07:00
murgatroid99	90bb8a9e2d	Node: fix leak of sent metadata	2017-04-06 10:37:44 -07:00
Jan Tattermusch	6d1edada93	Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_v12x	2017-04-06 17:11:44 +02:00
murgatroid99	694d3cc7cf	Merge branch 'master' into node_protobuf_js_6_upgrade	2017-04-04 17:19:34 -07:00