Commit Graph

3288 Commits

Author SHA1 Message Date
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
Kelvin Jin c28016f9e7 revert camelcase change 2018-04-11 15:19:43 -07:00
Kelvin Jin a07b03ab5c test: enable ci for node 9 2018-04-11 15:14:05 -07:00
Kelvin Jin 94906e4122 client library integration: adjust options 2018-04-11 15:11:18 -07:00
Michael Lumish b99bfc42ca
Merge pull request #270 from murgatroid99/nvm_upgrade_backport
Backport nvm changes to v1.11.x
2018-04-11 15:08:09 -07:00
Nicolas "Pixel" Noble aaf8696d42 Workarounding node-gyp issue. 2018-04-11 14:10:16 -07:00
Nicolas "Pixel" Noble 8c92bdbc33 Adding more environment details. 2018-04-11 14:10:08 -07:00
Nicolas "Pixel" Noble dc071f906b Debugging info. 2018-04-11 14:09:39 -07:00
Nicolas "Pixel" Noble 2bab8dc02b Changing to the powershell version of nvm for better support. 2018-04-11 14:09:31 -07:00
murgatroid99 27cc80adac Add note about @grpc/grpc-js alpha status 2018-04-11 13:29:49 -07:00
Nicolas Noble 5b0f7b1faf
Merge pull request #224 from nicolasnoble/nvm-ps
Changing to the powershell version of nvm for better support.
2018-04-10 11:17:46 -07:00
Michael Lumish 37460f01f3
Merge pull request #266 from murgatroid99/upmerge_zdefs_fix
Backport "Removing zdefs" to v1.11.x
2018-04-10 11:16:35 -07:00
Michael Lumish 124ada3e2f
Merge pull request #263 from kjin/save-branch
client lib integration: monkeypatches for google-gax & @google-cloud/common-grpc
2018-04-10 11:04:55 -07:00
Nicolas "Pixel" Noble b20e2a2c63 Workarounding node-gyp issue. 2018-04-10 19:28:51 +02:00
Nicolas "Pixel" Noble 37a811b630 Removing zdefs. 2018-04-10 10:18:03 -07:00
Kelvin Jin 6c1f4bc621 client lib integration changes 2018-04-06 14:06:02 -07:00
Michael Lumish 71429fa12b
Merge pull request #261 from murgatroid99/another_submodule_update
Update v1.11.x to v1.11.0-pre1 for real this time with bugfixes
2018-04-06 13:49:08 -07:00
Michael Lumish 04f1a0f472
Merge pull request #262 from murgatroid99/fix_master_version
Point master back at submodule master branch
2018-04-06 13:48:54 -07:00
murgatroid99 f05768f48f Point master back at submodule master branch 2018-04-06 11:58:59 -07:00
murgatroid99 55106fa154 Update v1.11.x to v1.11.0-pre1 for real this time with bugfixes 2018-04-06 11:57:44 -07:00
Michael Lumish 4ae876d929
Merge pull request #259 from murgatroid99/protobuf_package_improvements
Improve proto-loader package.json and documentation to prepare to publish it
2018-04-05 15:08:50 -07:00
Michael Lumish f35481b8da
Merge pull request #257 from murgatroid99/v1.11.0-pre1_update
Update v1.11.x branch to v1.11.0-pre1
2018-04-05 15:08:43 -07:00
murgatroid99 d73cd4a335 Update v1.11.x branch to v1.11.0-pre1 2018-04-05 14:26:21 -07:00
murgatroid99 48817ceaea Improve proto-loader package.json and documentation to prepare to publish it 2018-04-05 14:24:15 -07:00
Michael Lumish 0290422356
Merge pull request #255 from nicolasnoble/zdefs
Removing zdefs.
2018-04-05 12:23:46 -07:00
Michael Lumish 0dfd199c38
Merge pull request #256 from murgatroid99/v1.10.x_upmerge
V1.10.x upmerge
2018-04-04 16:45:24 -07:00
Nicolas "Pixel" Noble 0e05c902f1 Adding more environment details. 2018-04-05 01:41:23 +02:00
murgatroid99 763a48f6fb Merge remote-tracking branch 'upstream/v1.10.x' into v1.10.x_upmerge 2018-04-04 15:56:02 -07:00
Nicolas "Pixel" Noble f453180d3e Removing zdefs. 2018-04-05 00:53:40 +02:00
Michael Lumish 799aee603d
Merge pull request #252 from murgatroid99/v1.11.x_submodule_update
Update master to v1.11.0-dev
2018-04-04 15:48:13 -07:00
murgatroid99 4f9ce64f8b Update master to v1.11.0-dev 2018-04-04 15:08:26 -07:00
Nicolas Noble 5a761f757e
Merge pull request #253 from kellycampbell/protobufjsVersion-msg
Update error msg for Protobuf.js detection options
2018-04-04 07:34:55 -07:00
Kelly Campbell 434e6c45c1 Update error msg for Protobuf.js detection from 'protobufjs_version' to 'protobufjsVersion' 2018-04-03 19:58:42 -04:00
Michael Lumish 0cd71d959e
Merge pull request #234 from ofrobots/nan-callback
fix: avoid using deprecated Nan APIs
2018-04-03 16:53:47 -07:00
Ali Ijaz Sheikh 4bfa1430ef fix: avoid using deprecated Nan APIs
Starting with Nan 2.9.x certain Nan::Callback::Call APIs are
deprecated. Instead there are mechanisms in place that allow native
modules to preserve async context across async calls.
2018-04-03 16:02:46 -07:00