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, 16 insertions, 25 deletions

diff --git a/deps/npm/node_modules/npm-registry-client/test/adduser-update.js b/deps/npm/node_modules/npm-registry-client/test/adduser-update.js
index 3704571475..551c9843ed 100644
--- a/deps/npm/node_modules/npm-registry-client/test/adduser-update.js
+++ b/deps/npm/node_modules/npm-registry-client/test/adduser-update.js
@@ -1,29 +1,22 @@
-var tap = require('tap')
-var server = require('./fixtures/server.js')
-var RC = require('../')
-var client = new RC({
-    cache: __dirname + '/fixtures/cache'
-  , registry: 'http://localhost:' + server.port })
+var tap = require("tap")
 
-var userdata =
-{ name: 'username',
-  email: 'i@izs.me',
-  _id: 'org.couchdb.user:username',
-  type: 'user',
-  roles: [],
-  _rev: "1-15aac515ac515aac515aac515aac5125"
-}
+var server = require("./lib/server.js")
+var common = require("./lib/common.js")
+var client = common.freshClient()
 
-, password = "password"
+var password = "password"
 , username = "username"
-, crypto = require("crypto")
-, SD = require('string_decoder').StringDecoder
-, decoder = new SD
-
+, email = "i@izs.me"
+, userdata = {
+  name: username,
+  email: email,
+  _id: "org.couchdb.user:username",
+  type: "user",
+  roles: [],
+  date: "2012-06-07T04:11:21.591Z" }
+, SD = require("string_decoder").StringDecoder
+, decoder = new SD()
 
-function sha (s) {
-  return crypto.createHash("sha1").update(s).digest("hex")
-}
 
 tap.test("update a user acct", function (t) {
   server.expect("PUT", "/-/user/org.couchdb.user:username", function (req, res) {
@@ -56,9 +49,7 @@ tap.test("update a user acct", function (t) {
     })
   })
 
-
-
-  client.adduser(username, password, "i@izs.me", function (er, data, raw, res) {
+  client.adduser("http://localhost:1337/", username, password, email, function (er, data) {
     if (er) throw er
     t.deepEqual(data, { created: true })
     t.end()