Merge remote-tracking branch 'upstream/v1.11.x' into v1.11.x_merge

2018-05-03 15:22:22 -07:00 · 2018-05-03 15:22:22 -07:00 · 3187dfe4ab
parent a6747e910b 1099e028f0
commit 3187dfe4ab
2 changed files with 2 additions and 2 deletions
--- a/packages/grpc-native-core/build.yaml
+++ b/packages/grpc-native-core/build.yaml
@ -1,3 +1,3 @@
 settings:
  '#': It's possible to have node_version here as a key to override the core's version.
-  'node_version': 1.11.1
+  'node_version': 1.11.2
--- a/packages/grpc-native-core/package.json
+++ b/packages/grpc-native-core/package.json
@ -1,6 +1,6 @@
 {
  "name": "grpc",
-  "version": "1.11.1",
+  "version": "1.11.2",
  "author": "Google Inc.",
  "description": "gRPC Library for Node",
  "homepage": "https://grpc.io/",