deps: upgrade npm to 2.11.0

PR-URL: https://github.com/iojs/io.js/pull/1829
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>

3 files changed, 31 insertions, 43 deletions

diff --git a/deps/npm/node_modules/lockfile/LICENSE b/deps/npm/node_modules/lockfile/LICENSE
index 0c44ae716d..19129e315f 100644
--- a/deps/npm/node_modules/lockfile/LICENSE
+++ b/deps/npm/node_modules/lockfile/LICENSE
@@ -1,27 +1,15 @@
-Copyright (c) Isaac Z. Schlueter ("Author")
-All rights reserved.
+The ISC License
 
-The BSD License
+Copyright (c) Isaac Z. Schlueter and Contributors
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
 
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
+IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
diff --git a/deps/npm/node_modules/lockfile/README.md b/deps/npm/node_modules/lockfile/README.md
index b3adccef1a..3960194f06 100644
--- a/deps/npm/node_modules/lockfile/README.md
+++ b/deps/npm/node_modules/lockfile/README.md
@@ -51,13 +51,13 @@ Close and unlink the lockfile.
 
 Check if the lockfile is locked and not stale.
 
-Returns boolean.
+Callback is called with `cb(error, isLocked)`.
 
-### lockFile.checkSync(path, [opts], cb)
+### lockFile.checkSync(path, [opts])
 
 Check if the lockfile is locked and not stale.
 
-Callback is called with `cb(error, isLocked)`.
+Returns boolean.
 
 ## Options
 
diff --git a/deps/npm/node_modules/lockfile/package.json b/deps/npm/node_modules/lockfile/package.json
index 27bd23777d..cd18aa2ed5 100644
--- a/deps/npm/node_modules/lockfile/package.json
+++ b/deps/npm/node_modules/lockfile/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lockfile",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "main": "lockfile.js",
   "directories": {
     "test": "test"
@@ -15,7 +15,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/isaacs/lockfile"
+    "url": "git://github.com/isaacs/lockfile.git"
   },
   "keywords": [
     "lockfile",
@@ -29,20 +29,25 @@
     "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
-  "license": "BSD",
+  "license": "ISC",
   "description": "A very polite lock file utility, which endeavors to not litter, and to wait patiently for others.",
-  "gitHead": "9590c6f02521eb1bb154ddc3ca9a7e84ce770c45",
+  "gitHead": "9d338ed8e3e3a166955d051f6b5fb6bb1e563ca8",
   "bugs": {
     "url": "https://github.com/isaacs/lockfile/issues"
   },
-  "homepage": "https://github.com/isaacs/lockfile",
-  "_id": "lockfile@1.0.0",
-  "_shasum": "b3a7609dda6012060083bacb0ab0ecbca58e9203",
-  "_from": "lockfile@1.0.0",
-  "_npmVersion": "1.4.23",
+  "homepage": "https://github.com/isaacs/lockfile#readme",
+  "_id": "lockfile@1.0.1",
+  "_shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
+  "_from": "lockfile@>=1.0.0 <1.1.0",
+  "_npmVersion": "2.10.0",
+  "_nodeVersion": "2.0.1",
   "_npmUser": {
     "name": "isaacs",
-    "email": "i@izs.me"
+    "email": "isaacs@npmjs.com"
+  },
+  "dist": {
+    "shasum": "9d353ecfe3f54d150bb57f89d51746935a39c4f5",
+    "tarball": "http://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
   },
   "maintainers": [
     {
@@ -54,10 +59,5 @@
       "email": "i@izs.me"
     }
   ],
-  "dist": {
-    "shasum": "b3a7609dda6012060083bacb0ab0ecbca58e9203",
-    "tarball": "http://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz"
-  },
-  "_resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz",
-  "readme": "ERROR: No README data found!"
+  "_resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"
 }