Merge remote-tracking branch 'upstream/v0.12'merge-review

1 files changed, 3 insertions, 7 deletions

diff --git a/deps/npm/lib/docs.js b/deps/npm/lib/docs.js
index 9abe740a3..0de2349dd 100644
--- a/deps/npm/lib/docs.js
+++ b/deps/npm/lib/docs.js
@@ -11,13 +11,9 @@ var npm = require("./npm.js")
   , mapToRegistry = require("./utils/map-to-registry.js")
 
 docs.completion = function (opts, cb) {
-  mapToRegistry("/-/short", npm.config, function (er, uri, auth) {
-    if (er) return cb(er)
-
-    npm.registry.get(uri, { timeout : 60000, auth : auth }, function (er, list) {
-      return cb(null, list || [])
-    })
-  })
+  // FIXME: there used to be registry completion here, but it stopped making
+  // sense somewhere around 50,000 packages on the registry
+  cb()
 }
 
 function url (json) {