0
0
mirror of https://github.com/nodejs/node.git synced 2024-12-01 16:10:02 +01:00
nodejs/test
Timothy J Fontaine b19b60a05c Merge remote-tracking branch 'upstream/v0.10'
Reverted 9520adeb37

Conflicts:
	deps/cares/src/ares_parse_txt_reply.c
	deps/uv/.mailmap
	deps/uv/AUTHORS
	deps/uv/ChangeLog
	deps/uv/include/uv.h
	deps/uv/src/unix/error.c
	deps/uv/src/unix/process.c
	deps/uv/src/version.c
	deps/uv/src/win/pipe.c
	deps/uv/src/win/signal.c
	deps/uv/src/win/util.c
	deps/uv/test/test-spawn.c
	deps/uv/vcbuild.bat
	deps/v8/src/platform-posix.cc
	deps/v8/tools/gyp/v8.gyp
	lib/util.js
	src/node.cc
	test/simple/test-util-format.js
	test/simple/test-util.js
2014-05-01 13:54:23 -07:00
..
addons src, test: fix up ObjectWrap, make test-addons 2014-03-14 00:41:04 +04:00
debugger Merge remote-tracking branch 'upstream/v0.10' 2014-02-17 20:57:53 -08:00
disabled test: move pummel/test-fs-largefile to disabled 2014-02-24 17:03:28 -08:00
fixtures tls: support OCSP on client and server 2014-04-18 02:21:16 +04:00
gc test: update our branched weakref to v8 3.24 2014-03-17 10:19:47 -07:00
internet test: update test-dns.js after a60a9b0 2014-04-30 09:14:55 -07:00
message src: domain should not replace nextTick function 2014-03-03 16:27:58 -08:00
pummel crypto: move createCredentials to tls 2014-03-29 12:01:43 +04:00
simple Merge remote-tracking branch 'upstream/v0.10' 2014-05-01 13:54:23 -07:00
testpy addons: build and test examples 2014-01-22 00:39:13 +04:00
common.js child_process: execFileSync stderr should inherit 2014-02-18 16:03:13 +04:00