npm: Upgrade to v2.1.6

2 files changed, 28 insertions, 8 deletions

diff --git a/deps/npm/node_modules/retry/Readme.md b/deps/npm/node_modules/retry/Readme.md
index 2bb865097d..ba6602205a 100644
--- a/deps/npm/node_modules/retry/Readme.md
+++ b/deps/npm/node_modules/retry/Readme.md
@@ -14,7 +14,7 @@ This module has been tested and is ready to be used.
 
 The example below will retry a potentially failing `dns.resolve` operation
 `10` times using an exponential backoff strategy. With the default settings, this
-means the last attempt is made after `34 minutes and 7 seconds`.
+means the last attempt is made after `17 minutes and 3 seconds`.
 
 ``` javascript
 var dns = require('dns');
@@ -29,7 +29,7 @@ function faultTolerantResolve(address, cb) {
         return;
       }
 
-      cb(operation.mainError(), addresses);
+      cb(err ? operation.mainError() : null, addresses);
     });
   });
 }
@@ -69,8 +69,8 @@ milliseconds. If `options` is an array, a copy of that array is returned.
 
 * `retries`: The maximum amount of times to retry the operation. Default is `10`.
 * `factor`: The exponential factor to use. Default is `2`.
-* `minTimeout`: The amount of time before starting the first retry. Default is `1000`.
-* `maxTimeout`: The maximum amount of time between two retries. Default is `Infinity`.
+* `minTimeout`: The number of milliseconds before starting the first retry. Default is `1000`.
+* `maxTimeout`: The maximum number of milliseconds between two retries. Default is `Infinity`.
 * `randomize`: Randomizes the timeouts by multiplying with a factor between `1` to `2`. Default is `false`.
 
 The formula used to calculate the individual timeouts is:
diff --git a/deps/npm/node_modules/retry/package.json b/deps/npm/node_modules/retry/package.json
index 8f5e6d21f2..130fcae13a 100644
--- a/deps/npm/node_modules/retry/package.json
+++ b/deps/npm/node_modules/retry/package.json
@@ -6,11 +6,11 @@
   },
   "name": "retry",
   "description": "Abstraction for exponential and custom retry strategies for failed operations.",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "homepage": "https://github.com/tim-kos/node-retry",
   "repository": {
     "type": "git",
-    "url": "git://github.com/felixge/node-retry.git"
+    "url": "git://github.com/tim-kos/node-retry.git"
   },
   "directories": {
     "lib": "./lib"
@@ -24,6 +24,26 @@
     "fake": "0.2.0",
     "far": "0.0.1"
   },
-  "_id": "retry@0.6.0",
-  "_from": "retry"
+  "bugs": {
+    "url": "https://github.com/tim-kos/node-retry/issues"
+  },
+  "_id": "retry@0.6.1",
+  "_shasum": "fdc90eed943fde11b893554b8cc63d0e899ba918",
+  "_from": "retry@>=0.6.1 <0.7.0",
+  "_npmVersion": "1.4.9",
+  "_npmUser": {
+    "name": "tim-kos",
+    "email": "tim@debuggable.com"
+  },
+  "maintainers": [
+    {
+      "name": "tim-kos",
+      "email": "tim@debuggable.com"
+    }
+  ],
+  "dist": {
+    "shasum": "fdc90eed943fde11b893554b8cc63d0e899ba918",
+    "tarball": "http://registry.npmjs.org/retry/-/retry-0.6.1.tgz"
+  },
+  "_resolved": "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz"
 }