Commit Graph

201 Commits

Author SHA1 Message Date
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
Yuchen Zeng 79759fea1a Merge branch 'master' into v1.3.x 2017-04-25 11:08:04 -07:00
murgatroid99 633933ee0b Node: Don't depend on cares npm package 2017-04-19 13:23:06 -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 a5ea8f2150 Fix serializer error handling, update ProtoBuf.js dependency 2017-04-03 16:03:58 -07:00
Michael Lumish 5b5fdb7349 Merge branch 'master' into node_protobuf_js_6_upgrade 2017-04-03 10:34:07 -07:00
Yuchen Zeng f466ae116e Merge pull request #7771 from y-zeng/cares_buildin
Async DNS resolver with pre-configured c-ares
2017-03-24 14:52:04 -07:00
Michael Lumish cbe5036bb7 Merge branch 'master' into node_protobuf_js_6_upgrade 2017-03-24 13:51:47 -07:00
Nicolas "Pixel" Noble e44a50ffd7 Merge branch 'v1.2.x' of https://github.com/grpc/grpc into upmerge-1.2.0 2017-03-24 00:54:47 +01:00
Alexander Polcyn 3e30832cca bump v1.2.x branch to 1.2.1-pre1 2017-03-20 17:00:45 -07:00
David Garcia Quintas 69e5a28635 Going for 1.2.0 2017-03-20 12:51:17 -07:00
Yuchen Zeng 9bc0d8200e Merge remote-tracking branch 'upstream/master' into cares_bazel_rule 2017-03-17 16:00:17 -07:00
murgatroid99 b5b5f020a3 Upgrade Node dependency on Protobuf.js to version 6 2017-03-17 13:13:05 -07:00
Ken Payson 12ca7d319c Bump 1.2.x version to pre-2 2017-03-16 11:01:06 -07:00
murgatroid99 aaef11aa29 Drop support for io.js, fix minor issue with node extension 2017-03-14 11:19:25 -07:00
David Garcia Quintas 904e7f53ae Introducing 1.2.0-pre1 2017-03-09 15:02:19 -08:00
David Garcia Quintas 74cec10619 Bumped version to 1.3.0-dev 2017-03-09 15:00:26 -08:00
Yuchen Zeng 86d2115553 Merge remote-tracking branch 'upstream/master' into cares_bazel_rule 2017-02-01 16:12:08 -08:00
Craig Tiller 5cad46e218 Bump master version numbers 2017-01-30 15:32:24 -08:00
Yuchen Zeng 04ec4701e3 Merge remote-tracking branch 'upstream/master' into cares_buildin 2017-01-18 18:49:07 -08:00
murgatroid99 e8b1fd0cba Merge branch 'master' into node_electron_build 2017-01-13 09:48:55 -08:00
murgatroid99 d6c93802ff Update package.json with version compatibility changes 2016-11-29 09:17:57 -08:00
murgatroid99 fdbf733053 Merge branch 'master' into node_electron_build 2016-11-01 11:13:58 -07:00
murgatroid99 eaf7964001 Add test scripts for electron 2016-11-01 11:05:02 -07:00
Yuchen Zeng c76e9d3062 Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-10-28 15:41:58 -07:00
murgatroid99 5d6ae930ab Merge remote-tracking branch 'upstream/v1.0.x' into v1.0.1_upmerge 2016-10-28 11:48:22 -07:00
Nicolas "Pixel" Noble 50a730bd1c Going 1.0.1. 2016-10-26 21:42:29 +02:00
murgatroid99 3620287bbe Sanitize 2016-10-24 16:02:29 -07:00
murgatroid99 952b99cf21 Merge remote-tracking branch 'upstream/v1.0.x' into node_package_updates 2016-10-24 11:21:07 -07:00
murgatroid99 3dc67018a0 Fix issues with express benchmark and synchronize package.json with template 2016-10-18 15:56:44 -07:00
murgatroid99 b53e5d1f2b Create benchmark client and server for Node Express 2016-10-18 09:55:28 -07:00
Yuchen Zeng 78cc066db2 Merge remote-tracking branch 'upstream/master' into cares_buildin 2016-08-24 18:22:24 -07:00
Yuchen Zeng 502d644887 Use cares package in node 2016-08-22 17:36:24 -07:00
Nicolas "Pixel" Noble 35b8c51485 Bumping version to 1.0.1-pre1. 2016-08-18 21:57:20 +02:00
Yuchen Zeng 88d4e779b9 Fix python build on windows 2016-08-16 22:34:02 -07:00
Nicolas "Pixel" Noble 0f9337b6a0 Removing pre2 flag. 2016-08-16 03:07:09 +02:00
Nicolas "Pixel" Noble e1ee20bde6 Merge branch 'v1.0.x' of https://github.com/grpc/grpc into manual-upmerge 2016-08-16 01:54:33 +02:00
murgatroid99 c0a64cda94 Update Node library dependencies and change deprecated function calls 2016-08-15 13:14:16 -07:00
Yuchen Zeng db53cc0961 Fix node test 2016-08-10 05:04:53 -07:00
murgatroid99 a1c442a203 Merge remote-tracking branch 'upstream/v1.0.x' into node_dependency_update 2016-08-02 14:37:05 -07:00
Nicolas "Pixel" Noble 3260a1731a Bumping to 1.0.0-pre2. 2016-07-29 22:56:12 +02:00
murgatroid99 fcb5271105 Update node protobuf dependency to 3.0.0 where applicable. Also update example dependency to grpc 1.0.0 2016-07-29 10:44:01 -07:00
Nicolas "Pixel" Noble 49bfb92dc1 Master is now 1.1.0-dev. 2016-07-12 09:31:41 +02:00
Nicolas "Pixel" Noble 8c72ae43f9 Flagging master as 1.0.0-pre1. 2016-07-12 09:18:18 +02:00
murgatroid99 356758a7ee Split Node health check code into a separate package and make it use static codegen 2016-07-01 09:56:50 -07:00
murgatroid99 d29a3bf004 Update master branch to 0.16.0-dev 2016-06-24 10:26:14 -07:00
Nicolas Noble 38c6cfb82f Merge pull request #6536 from grpc/release-0_14
Release 0.14 upmerge
2016-05-11 10:45:37 -07:00
murgatroid99 3b3069d062 Add some missing directories to package.json 2016-05-11 08:43:01 -07:00
Nicolas "Pixel" Noble 2c75731b68 The release branch is now 0.14.1-pre1. 2016-05-10 09:26:34 +02:00