Merge remote-tracking branch 'upstream/v0.10' into v0.12

Conflicts:
	ChangeLog
	Makefile
	deps/uv/ChangeLog
	deps/uv/build.mk
	deps/uv/src/unix/darwin.c
	deps/uv/src/unix/getaddrinfo.c
	deps/uv/src/version.c
	deps/v8/src/checks.h
	deps/v8/src/isolate.h
	lib/cluster.js
	lib/module.js
	lib/timers.js
	lib/tls.js
	src/node_version.h

1 files changed, 4 insertions, 4 deletions

diff --git a/deps/npm/node_modules/npm-registry-client/lib/deprecate.js b/deps/npm/node_modules/npm-registry-client/lib/deprecate.js
index 9cbc6d88e3..078968dd32 100644
--- a/deps/npm/node_modules/npm-registry-client/lib/deprecate.js
+++ b/deps/npm/node_modules/npm-registry-client/lib/deprecate.js
@@ -1,9 +1,9 @@
-
 module.exports = deprecate
 
+var url = require("url")
 var semver = require("semver")
 
-function deprecate (name, ver, message, cb) {
+function deprecate (uri, ver, message, cb) {
   if (!this.conf.get('username')) {
     return cb(new Error("Must be logged in to deprecate a package"))
   }
@@ -12,7 +12,7 @@ function deprecate (name, ver, message, cb) {
     return cb(new Error("invalid version range: "+ver))
   }
 
-  this.get(name + '?write=true', function (er, data) {
+  this.get(uri + '?write=true', null, function (er, data) {
     if (er) return cb(er)
     // filter all the versions that match
     Object.keys(data.versions).filter(function (v) {
@@ -21,6 +21,6 @@ function deprecate (name, ver, message, cb) {
       data.versions[v].deprecated = message
     })
     // now update the doc on the registry
-    this.request('PUT', data._id, data, cb)
+    this.request('PUT', url.resolve(uri, data._id), { body : data }, cb)
   }.bind(this))
 }