deps: upgrade npm to 3.3.6

PR-URL: #3310 Reviewed-By: Jeremiah Senkpiel <[email protected]>
nodejs · Oct 26, 2015 · 32b51c9 · 32b51c9
1 parent 6e78382
commit 32b51c9
Show file tree

Hide file tree

Showing 1,820 changed files with 35,576 additions and 33,959 deletions.
diff --git a/deps/npm/.mailmap b/deps/npm/.mailmap
@@ -24,6 +24,7 @@ Isaac Z. Schlueter <[email protected]> <[email protected]>
 Isaac Z. Schlueter <[email protected]> isaacs <[email protected]>
 Jake Verbaten <[email protected]>
 James Sanders <[email protected]>
+James Treworgy <[email protected]>
 Jason Smith <[email protected]>
 Jonas Weber <[email protected]>
 Julien Meddah <[email protected]>

diff --git a/deps/npm/.travis.yml b/deps/npm/.travis.yml
@@ -8,7 +8,7 @@ env:
   - DEPLOY_VERSION=testing
 before_install:
   - "npm config set spin false"
-  - "npm install -g npm/npm#2.x"
+  - "node . install -g ."
   - "sudo mkdir -p /var/run/couchdb"
 script: "npm run-script test-all"
 notifications:

diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
@@ -291,11 +291,12 @@ Eduardo Pinho <[email protected]>
 Rachel Hutchison <[email protected]>
 Ryan Temple <[email protected]>
 Eugene Sharygin <[email protected]>
-Nick Heiner <[email protected]>
 James Talmage <[email protected]>
 jane arc <[email protected]>
 Joseph Dykstra <[email protected]>
+Andrew Crites <[email protected]>
 Joshua Egan <[email protected]>
+Carlos Alberto <[email protected]>
 Thomas Cort <[email protected]>
 Thaddee Tyl <[email protected]>
 Steve Klabnik <[email protected]>
@@ -308,7 +309,7 @@ murgatroid99 <[email protected]>
 Marcin Cieslak <[email protected]>
 João Reis <[email protected]>
 Matthew Hasbach <[email protected]>
-Anna Henningsen <[email protected]>
 Jon Hall <[email protected]>
+Anna Henningsen <[email protected]>
+James Treworgy <[email protected]>
 James Hartig <[email protected]>
-snopeks <[email protected]>