Merge pull request #929 from grpc/[email protected]

Upmerge 1.22

Author: murgatroid99

packages/grpc-native-core/binding.gyp

@@ -94,7 +94,7 @@
       'GPR_BACKWARDS_COMPATIBILITY_MODE',
       'GRPC_ARES=1',
       'GRPC_UV',
-      'GRPC_NODE_VERSION="1.22.0-dev"',
+      'GRPC_NODE_VERSION="1.22.0-pre1"',
       'CARES_STATICLIB',
       'CARES_SYMBOL_HIDING'
     ],

packages/grpc-native-core/deps/grpc

@@ -1,6 +1,6 @@
 {
   "name": "grpc",
-  "version": "1.22.0-dev",
+  "version": "1.22.0-pre1",
   "author": "Google Inc.",
   "description": "gRPC Library for Node",
   "homepage": "https://grpc.io/",

packages/grpc-native-core/package.json

@@ -61,7 +61,7 @@ describe('Name resolver', function() {
       done();
     });
   });
-  it('Should resolve a target to IPv4 and IPv6 addresses', function(done) {
+  it.skip('Should resolve a target to IPv4 and IPv6 addresses', function(done) {
     const client = new grpc.Client(`loopback46.unittest.grpc.io:${port}`, insecureCreds);
     let deadline = new Date();
     deadline.setSeconds(deadline.getSeconds() + 1);