Commit Graph

1822 Commits

Author SHA1 Message Date
murgatroid99 a6747e910b Merge remote-tracking branch 'upstream/v1.11.x' into v1.11.x_merge 2018-05-03 14:30:11 -07:00
Nicolas "Pixel" Noble ff9ec4bcfd Version bump to 1.11.2 2018-05-03 23:01:25 +02:00
Nicolas Noble bee673f66d
Merge pull request #307 from JustinBeckwith/fix-types
fix: use capital `F` for `Function` when used as a type
2018-05-02 19:04:45 -07:00
Justin Beckwith 5233c2d8eb fix: use capital `F` for `Function` when used as a type 2018-05-02 15:24:34 -07:00
Michael Lumish 0631ee7828
Merge pull request #306 from murgatroid99/typescript_interface_updates
Add loadPackageDefinition and interceptor APIs to .d.ts file
2018-05-02 13:31:48 -07:00
murgatroid99 85c154c507 Add loadPackageDefinition and interceptor APIs to .d.ts file 2018-05-02 11:55:41 -07:00
Nicolas Noble 48853903b7
Merge pull request #302 from nicolasnoble/node-10
Adding initial node 10 support.
2018-05-01 21:27:14 -07:00
Nicolas "Pixel" Noble 30310d79b1 Better this way... 2018-05-02 05:36:19 +02:00
Nicolas "Pixel" Noble c5fbaf1b5b Reverting these... 2018-05-02 05:34:18 +02:00
Nicolas "Pixel" Noble c794c05783 Merge branch 'v1.11.x' of https://github.com/grpc/grpc-node into node-10 2018-05-02 04:31:39 +02:00
Nicolas Noble 13afb85154
Merge pull request #304 from murgatroid99/package_missing_files
Add a missing directory to grpc package.json
2018-05-01 19:29:07 -07:00
Nicolas Noble f2b2bedb31
Merge pull request #291 from nicolasnoble/electron2
Let's start building electron 2 binaries.
2018-05-01 19:27:56 -07:00
Nicolas "Pixel" Noble d46556622d More nvm love. 2018-05-02 04:11:35 +02:00
Nicolas "Pixel" Noble 727e54ef1b Right. We need to install nvm into the docker image. 2018-05-02 04:07:41 +02:00
Nicolas "Pixel" Noble c94718c007 Let's double down on installing node 10... 2018-05-02 03:41:42 +02:00
Nicolas "Pixel" Noble 1ef4c90270 Let's start building electron 2 binaries. 2018-05-02 03:36:33 +02:00
Nicolas "Pixel" Noble 582c171da4 Shuffling things around a bit better... 2018-05-02 01:43:31 +02:00
Nicolas "Pixel" Noble 5f47953c88 Installing nvm from kokoro scripts. 2018-05-02 01:20:08 +02:00
Nicolas "Pixel" Noble e35856061e Building with node 10, because otherwise there's a weird issue, and I can't be bothered to understand it. 2018-05-02 00:45:04 +02:00
murgatroid99 05221bad26 Add a missing directory to grpc package.json 2018-05-01 15:21:58 -07:00
Nicolas "Pixel" Noble 9d1904fb9a Adding initial node 10 support. 2018-05-01 23:32:30 +02:00
Michael Lumish 1b9b9897e3
Merge pull request #298 from murgatroid99/proto_loader_include_option_name_change
Change 'include' to 'includeDirs' in proto-loader package
2018-04-30 14:59:22 -07:00
Michael Lumish c9aa5f710c
Merge pull request #299 from murgatroid99/v1.11.0_bump
Bump version to v1.11.0
2018-04-30 14:45:08 -07:00
Michael Lumish 9cab9e2d4f
Merge pull request #295 from murgatroid99/protobuf_bump_backport
Update protobufjs version
2018-04-30 14:30:02 -07:00
murgatroid99 d1c973890e Bump version to v1.11.0 2018-04-30 14:00:42 -07:00
Michael Lumish aac7d76e39
Merge pull request #297 from murgatroid99/node4_test_script_fix
Don't upgrade npm in Windows tests
2018-04-30 13:49:19 -07:00
murgatroid99 a63f534979 Change 'include' to 'includeDirs' in proto-loader package 2018-04-30 13:31:12 -07:00
murgatroid99 5405aa31f4 Upgrade npm on Node 4 2018-04-30 13:04:03 -07:00
murgatroid99 ff16b66b6f Don't upgrade npm in Windows tests 2018-04-30 09:39:56 -07:00
Nikos Koumbakis cf004c30a5 Update protobufjs version
Fixes [ReDoS Vulnerability](https://github.com/dcodeIO/protobuf.js/releases/tag/6.8.6)
2018-04-27 14:20:30 -07:00
Michael Lumish ec9af5d3bb
Merge pull request #292 from rhapsodyn/patch-1
typo
2018-04-24 10:15:24 -07:00
tassadarliu 4694b7371c
typo 2018-04-23 17:28:47 +08:00
Michael Lumish a237967338
Merge pull request #286 from murgatroid99/cross_impl_perf_tests
Update benchmark code to handle both implementations
2018-04-20 15:51:00 -07:00
murgatroid99 0b075f18bb Add subchannel error handler, copy waitForReady wrapper from 1.11 2018-04-20 14:46:51 -07:00
murgatroid99 cad47e4de8 Update benchmark code to handle both implementations 2018-04-19 16:10:48 -07:00
Michael Lumish 7667741056
Merge pull request #278 from SpiralOutDotEu/master
Fixes #277 ReDoS Vulnerability
2018-04-19 11:29:42 -07:00
Michael Lumish f1acaf299a
Merge pull request #285 from murgatroid99/ts_style_cleanup
Fix lint errors and formatting
2018-04-18 16:54:13 -07:00
murgatroid99 881b82d50c Fix lint errors and formatting 2018-04-18 11:32:46 -07:00
Michael Lumish 5c9a79272d
Merge pull request #283 from kjin/v1.11.x-backport-275
Backport #275 to v1.11.x
2018-04-17 16:14:01 -07:00
Michael Lumish d5a3e5da9f
Merge pull request #282 from murgatroid99/purejs_unimplemented_errors
Pure JS: Add unimplemented errors for several API functions
2018-04-17 16:11:58 -07:00
Kelvin Jin 9112ac194b js: only listen for channel connect event once 2018-04-17 14:10:36 -07:00
murgatroid99 dd3eb9e0f8 Add unimplemented errors for several API functions 2018-04-17 14:06:52 -07:00
Michael Lumish 8176c70a94
Merge pull request #275 from kjin/grpc-js-connect
grpc-js-core: only listen for channel connect event once
2018-04-17 11:24:40 -07:00
Nikos Koumbakis ee5ea6e081
Merge pull request #1 from SpiralOutDotEu/SpiralOutDotEu-patch-1
Update protobufjs version
2018-04-15 20:49:35 +03:00
Nikos Koumbakis 9985445a48
Update protobufjs version
Fixes [ReDoS Vulnerability](https://github.com/dcodeIO/protobuf.js/releases/tag/6.8.6)
2018-04-15 20:48:30 +03:00
Michael Lumish e389a251d1
Merge pull request #276 from murgatroid99/submodule_reversion
Switch grpc submodule to v1.10.x
2018-04-13 15:49:28 -07:00
murgatroid99 eabda8118a Switch grpc submodule to v1.10.x 2018-04-13 10:29:11 -07:00
Kelvin Jin c0f7afec32 js: only listen for channel connect event once 2018-04-12 12:17:52 -07:00
Michael Lumish ee8ec2e086
Merge pull request #271 from kjin/grpc-protobuf-options
client library integration: adjust options
2018-04-11 16:14:32 -07:00
Michael Lumish b4e677cb46
Merge pull request #269 from murgatroid99/pure_js_alpha_note
Add note about @grpc/grpc-js alpha status
2018-04-11 16:00:29 -07:00