Timothy J Fontaine 429b58701a Merge remote-tracking branch 'upstream/v0.10' ...

Conflicts:
	deps/uv/ChangeLog
	deps/uv/build.mk
	deps/uv/src/version.c
	deps/uv/test/test-ipc.c
	deps/v8/src/objects.cc
	src/node.cc
	src/node_os.cc

2014-01-13 14:56:12 -08:00

..

addons

test: modify async native test.js to test for #4820

2013-02-21 13:14:07 -08:00

disabled

fixes #6031 spelling errors

2013-08-19 16:42:16 -07:00

fixtures

test: fix assumption of worker exit on disconnect

2013-12-31 11:43:44 -08:00

gc

test: fix up weakref.cc after v8 api change

2013-10-23 09:17:32 -07:00

internet

dns: add resolveSoa and 'SOA' rrtype

2013-12-31 14:30:40 -08:00

message

src: only access stack of non-null errors

2013-12-23 15:08:11 +04:00

pummel

gyp: build openssl-cli tool and use it in tests

2013-12-11 21:21:10 +04:00

simple

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

2014-01-13 14:56:12 -08:00

common.js

gyp: build openssl-cli tool and use it in tests

2013-12-11 21:21:10 +04:00