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, 22 insertions, 0 deletions

diff --git a/deps/npm/node_modules/glob/test/error-callback.js b/deps/npm/node_modules/glob/test/error-callback.js
new file mode 100644
index 0000000000..629eb28434
--- /dev/null
+++ b/deps/npm/node_modules/glob/test/error-callback.js
@@ -0,0 +1,22 @@
+var fs
+try { fs = require('graceful-fs') } catch (e) { fs = require('fs') }
+var fs = require('graceful-fs')
+var test = require('tap').test
+var glob = require('../')
+
+test('mock fs', function(t) {
+  fs.readdir = function(path, cb) {
+    process.nextTick(function() {
+      cb(new Error('mock fs.readdir error'))
+    })
+  }
+  t.pass('mocked')
+  t.end()
+})
+
+test('error callback', function(t) {
+  glob('*', function(err, res) {
+    t.ok(err, 'expecting mock error')
+    t.end()
+  })
+})